| commit | c4a04756813a54ad0433bc153d1292e15016161f | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Fri Feb 03 14:42:19 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 03 14:42:19 2023 +0000 |
| tree | bdfe7bcd5665a574356875718dc66036d1e331a9 | |
| parent | a50ca10f3378bf8253931f70242ccf7ab214048c [diff] | |
| parent | 1befdab699d448dea5c78cdb433121971e274996 [diff] |
Only primary user is allowed to control secure nfc am: 0e57ff90cd am: c098bdcad0 am: 3ccadd2c97 am: 9d643d3042 am: 4745a591c5 am: 34ce0e2c3a am: 1befdab699 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458 Change-Id: Iafe87e53b9337f84dcd44494e509aa8398b0298c 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 cf43ec3..460eca3 100644 --- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java +++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
@@ -109,7 +109,7 @@ } private boolean isToggleable() { - if (mUserManager.isGuestUser()) { + if (!mUserManager.isPrimaryUser()) { return false; } return true;