commit 446b78cd521bf53cc1eec9bee52cb4740cde79a2
author Paul Lawrence <paullawrence@google.com> Tue Feb 02 21:54:06 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 02 21:54:06 2016 +0000
tree 235935151d3fd47c00d80e32c8d69e55b8b19e5e
parent b9c70a11f245a78dfb11717c113f124c078a2c94
parent fb4c583dba1fb8885ff9369bdab916eaa61b42bd

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

src/com/android/settings/ChooseLockGeneric.java

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;