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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-13 02:45:04 +00:00
committed by Android (Google) Code Review
parent 0181643bb7 afb01f12cd
commit c56bcb5e7f
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)) {
return UNSUPPORTED_ON_DEVICE;
}
if (!mUserManager.isAdminUser()) {
return DISABLED_FOR_USER;
}
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);
}
@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);