Merge "Implement DISALLOW_NFC AE user restriction" into main
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 152446c..191c86d 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -33,7 +33,9 @@
android:icon="@drawable/ic_nfc"
android:order="-7"
settings:searchable="false"
- settings:controller="com.android.settings.connecteddevice.NfcAndPaymentFragmentController"/>
+ settings:controller="com.android.settings.connecteddevice.NfcAndPaymentFragmentController"
+ settings:userRestriction="no_near_field_communication_radio"
+ settings:useAdminDisabledSummary="true"/>
<Preference
android:fragment="com.android.settings.wfd.WifiDisplaySettings"