Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 6f1f3e47 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r66' of...

Merge tag 'android-security-11.0.0_r66' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-18.1_merge_android-security-11.0.0_r66

Android Security 11.0.0 Release 66 (9682389)

* tag 'android-security-11.0.0_r66' of https://android.googlesource.com/platform/packages/apps/Settings:
  Only primary user is allowed to control secure nfc

Change-Id: Id5dcd488f64b82080bb2307154f256cc077d6c1c
parents 855121cd ad1acbfd
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class SecureNfcEnabler extends BaseNfcEnabler {
    }

    private boolean isToggleable() {
        if (mUserManager.isGuestUser()) {
        if (!mUserManager.isPrimaryUser()) {
            return false;
        }
        return true;
+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
    }

    private boolean isToggleable() {
        if (mUserManager.isGuestUser()) {
        if (!mUserManager.isPrimaryUser()) {
            return false;
        }
        return true;