| commit | fb4c583dba1fb8885ff9369bdab916eaa61b42bd | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Jan 29 13:25:36 2016 -0800 |
| committer | Paul Lawrence <paullawrence@google.com> | Fri Jan 29 13:25:36 2016 -0800 |
| tree | e7011e1639511efc82926d4a5a4e12cb729b76a7 | |
| parent | fe22e8998b839967c555f3d77a00cfa2c8368729 [diff] |
Don't show 'unlock at boot' for file encryption Change-Id: I8906023942a2fa0c5c303aeabb48737ec43fc737
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 03a3fef..42ae602 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -240,6 +240,7 @@ if (UserManager.get(getActivity()).isAdminUser() && mUserId == UserHandle.myUserId() && LockPatternUtils.isDeviceEncryptionEnabled() + && !LockPatternUtils.isFileEncryptionEnabled() && !dpm.getDoNotAskCredentialsOnBoot()) { mEncryptionRequestQuality = quality; mEncryptionRequestDisabled = disabled;