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

Commit 8716ebc4 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Only primary user is allowed to control secure nfc am: 0e57ff90 am:... 

Only primary user is allowed to control secure nfc am: 0e57ff90 am: c098bdca am: 3ccadd2c am: 9d643d30 am: 4745a591 am: 34ce0e2c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458



Change-Id: I68d9f6e174a3d9100b2ea3094d527da4c92cc760
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30c88f6f 34ce0e2c

src/com/android/settings/nfc/SecureNfcEnabler.java

+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;

src/com/android/settings/nfc/SecureNfcPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController 
    }



    private boolean isToggleable() {

        if (mUserManager.isGuestUser()) {

        if (!mUserManager.isPrimaryUser()) {

            return false;

        }

        return true;