PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NFC UI is not available when switching to 2nd user

Browse Source 
Bug: 152581438
Test: (1) make -j42 RunSettingsRoboTests (2) check NFC UI and function work as 2nd user
Change-Id: Ibf0346b992406c1d6329580083c1cd49180376cf
This commit is contained in:
Robert Luo
2020-04-12 15:27:18 +08:00
parent 99eeb00360
commit afb01f12cd
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java
View File

@@ -47,9 +47,6 @@ public class NfcAndPaymentFragmentController extends BasePreferenceController {
PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) { PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
} }
if (!mUserManager.isAdminUser()) {
return DISABLED_FOR_USER;
}
return AVAILABLE; return AVAILABLE;
} }

10
tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java
View File

@@ -85,16 +85,6 @@ public class NfcAndPaymentFragmentControllerTest {
.isEqualTo(NfcAndPaymentFragmentController.UNSUPPORTED_ON_DEVICE); .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 @Test
public void getSummary_nfcOn_shouldProvideOnSummary() { public void getSummary_nfcOn_shouldProvideOnSummary() {
when(mNfcAdapter.isEnabled()).thenReturn(true); when(mNfcAdapter.isEnabled()).thenReturn(true);