From afb01f12cd6616c6b6baf4d225270146877467ed Mon Sep 17 00:00:00 2001 From: Robert Luo Date: Sun, 12 Apr 2020 15:27:18 +0800 Subject: [PATCH] Fix NFC UI is not available when switching to 2nd user Bug: 152581438 Test: (1) make -j42 RunSettingsRoboTests (2) check NFC UI and function work as 2nd user Change-Id: Ibf0346b992406c1d6329580083c1cd49180376cf --- .../NfcAndPaymentFragmentController.java | 3 --- .../NfcAndPaymentFragmentControllerTest.java | 10 ---------- 2 files changed, 13 deletions(-) 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);