| commit | 9d643d3042f208fca165b0e829466cbe68859179 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Fri Feb 03 11:27:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 03 11:27:23 2023 +0000 |
| tree | 6ace8c92dc68c28ae89916f98cfa105a900cb6ed | |
| parent | 8c70085bab030575b74f00b4bc0602dda55cd276 [diff] | |
| parent | 3ccadd2c977dabedc587e24cebc36d3f4d54f2c2 [diff] |
Only primary user is allowed to control secure nfc am: 0e57ff90cd am: c098bdcad0 am: 3ccadd2c97 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458 Change-Id: I763baefc5b94776c0583273fe9ab47ae99e6a57c 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;