| commit | 78b42aeb37c04c0da0fe07f46c2558f15a7efc6b | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Thu Jul 28 19:42:27 2022 +0800 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Feb 14 18:18:19 2023 +0000 |
| tree | e20a7029e538b53dfcc4021913cfe624157dc919 | |
| parent | 211f81afe632cc7b5e085adfb3d7949d80e0b810 [diff] |
Only primary user is allowed to control secure nfc Bug: 238298970 Test: manual Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313 Change-Id: I945490ef1e62af479a732c9a260ed94bdd8bc313 (cherry picked from commit 0e57ff90cdae3575c243d21d490e2b6384d33397) Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
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;