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

Commit ad1acbfd authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21154458']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21154458'] into security-aosp-rvc-release.

Change-Id: Ie4aaecfe898b4715c250ae1c497a6f14644b6227
parents 4053fe7a edbb4977

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
@@ -103,7 +103,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController 
    }



    private boolean isToggleable() {

        if (mUserManager.isGuestUser()) {

        if (!mUserManager.isPrimaryUser()) {

            return false;

        }

        return true;