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

Change-Id: I8906023942a2fa0c5c303aeabb48737ec43fc737
This commit is contained in:
Paul Lawrence
2016-01-29 13:25:36 -08:00
parent fe22e8998b
commit fb4c583dba

View File

@@ -240,6 +240,7 @@ public class ChooseLockGeneric extends SettingsActivity {
if (UserManager.get(getActivity()).isAdminUser() if (UserManager.get(getActivity()).isAdminUser()
&& mUserId == UserHandle.myUserId() && mUserId == UserHandle.myUserId()
&& LockPatternUtils.isDeviceEncryptionEnabled() && LockPatternUtils.isDeviceEncryptionEnabled()
&& !LockPatternUtils.isFileEncryptionEnabled()
&& !dpm.getDoNotAskCredentialsOnBoot()) { && !dpm.getDoNotAskCredentialsOnBoot()) {
mEncryptionRequestQuality = quality; mEncryptionRequestQuality = quality;
mEncryptionRequestDisabled = disabled; mEncryptionRequestDisabled = disabled;