diff --git a/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java b/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java index fef1922fa30..17958c96010 100644 --- 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; } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java index fdedc887a27..ffaade3fda3 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java @@ -85,16 +85,6 @@ public class NfcAndPaymentFragmentControllerTest { .isEqualTo(NfcAndPaymentFragmentController.UNSUPPORTED_ON_DEVICE); } - @Test - public void getAvailabilityStatus_notAdminUser_shouldReturnDisabled() { - when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true); - when(mUserManager.isAdminUser()).thenReturn(false); - when(mNfcAdapter.isEnabled()).thenReturn(true); - - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(NfcAndPaymentFragmentController.DISABLED_FOR_USER); - } - @Test public void getSummary_nfcOn_shouldProvideOnSummary() { when(mNfcAdapter.isEnabled()).thenReturn(true);