Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afb01f12 authored Apr 12, 2020 by Robert Luo

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

parent 99eeb003

src/com/android/settings/connecteddevice/NfcAndPaymentFragmentController.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -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);