Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e86e4717 authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2716375



Change-Id: I0cd0d4bea29c9e82f75b266e6a9daf0b617b3f97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e75ae19e a3f6a70e

res/xml/connected_devices_advanced.xml

+3 −1
Original line number Diff line number Diff line
@@ -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"