| commit | 450cacbee4df5cb2f336b7c7f6089660e86f67ee | [log] [tgz] |
|---|---|---|
| author | Iavor-Valentin Iftime <valiiftime@google.com> | Mon Mar 06 17:06:11 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 06 17:06:11 2023 +0000 |
| tree | 0d485989db00c0edf1799f2311b165d6f9948bc8 | |
| parent | 0e57ff90cdae3575c243d21d490e2b6384d33397 [diff] | |
| parent | 5fb0705664449e2a62c6219a8a417749620bb937 [diff] |
Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev
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;