Merge "Fix NFC UI is not available when switching to 2nd user" into rvc-dev am: c56bcb5e7f am: a287641adf am: b4b63b60b9 am: 83646cd7fc

Change-Id: If1cb9c424658b44ad5f3ddf2e56730973de3ee12
2020-04-13 03:58:44 +00:00
parent dd4ef7e5bd 83646cd7fc
commit f044ae9bce
2 changed files with 0 additions and 13 deletions
--- a/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
+++ b/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
@@ -47,9 +47,6 @@ public class NfcAndPaymentFragmentController extends BasePreferenceController {
                PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
            return UNSUPPORTED_ON_DEVICE;
        }
-        if (!mUserManager.isAdminUser()) {
-            return DISABLED_FOR_USER;
-        }
        return AVAILABLE;
    }