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

Change-Id: Ifa0eadf6b26b46c2cc0a2f57628a12ea2f7363f3
2020-04-13 03:00:51 +00:00
parent f4d5666aea c56bcb5e7f
commit 2fa2b57ec2
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;
    }