| commit | c098bdcad0cc98de8bcd0687df1ed962339cf088 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Fri Feb 03 09:21:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 03 09:21:04 2023 +0000 |
| tree | 72e985681d2b125a8aff2ba1a0825c3a78286fc4 | |
| parent | 6326f5e65ad788de310f44c1aa3fbbfe6525dc22 [diff] | |
| parent | 0e57ff90cdae3575c243d21d490e2b6384d33397 [diff] |
Only primary user is allowed to control secure nfc am: 0e57ff90cd 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>
diff --git a/src/com/android/settings/nfc/SecureNfcEnabler.java b/src/com/android/settings/nfc/SecureNfcEnabler.java index f31a382..ad5c4ab 100644 --- a/src/com/android/settings/nfc/SecureNfcEnabler.java +++ b/src/com/android/settings/nfc/SecureNfcEnabler.java
@@ -61,7 +61,7 @@ } private boolean isToggleable() { - if (mUserManager.isGuestUser()) { + if (!mUserManager.isPrimaryUser()) { return false; } return true;
diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java index 575bab1..c13d74a 100644 --- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java +++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
@@ -103,7 +103,7 @@ } private boolean isToggleable() { - if (mUserManager.isGuestUser()) { + if (!mUserManager.isPrimaryUser()) { return false; } return true;