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

Commit c098bdca authored Feb 03, 2023 by Jack Yu Committed by Automerger Merge Worker Feb 03, 2023

Only primary user is allowed to control secure nfc am: 0e57ff90

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458

Change-Id: I35c94f779d47e27c170ec3b4becafc563f077a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6326f5e6 0e57ff90

src/com/android/settings/nfc/SecureNfcEnabler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public class SecureNfcEnabler extends BaseNfcEnabler {
		}

		private boolean isToggleable() {
		if (mUserManager.isGuestUser()) {
		if (!mUserManager.isPrimaryUser()) {
		return false;
		}
		return true;

src/com/android/settings/nfc/SecureNfcPreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
		}

		private boolean isToggleable() {
		if (mUserManager.isGuestUser()) {
		if (!mUserManager.isPrimaryUser()) {
		return false;
		}
		return true;