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

Commit 446b78cd authored by Paul Lawrence's avatar Paul Lawrence Committed by Android (Google) Code Review
Browse files

Merge "Don't show 'unlock at boot' for file encryption"

parents b9c70a11 fb4c583d

src/com/android/settings/ChooseLockGeneric.java

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ public class ChooseLockGeneric extends SettingsActivity { 
            if (UserManager.get(getActivity()).isAdminUser()

                    && mUserId == UserHandle.myUserId()

                    && LockPatternUtils.isDeviceEncryptionEnabled()

                    && !LockPatternUtils.isFileEncryptionEnabled()

                    && !dpm.getDoNotAskCredentialsOnBoot()) {

                mEncryptionRequestQuality = quality;

                mEncryptionRequestDisabled = disabled;