From: Paul Lawrence <paullawrence@google.com>
Date: Fri, 29 Jan 2016 21:25:36 +0000 (-0800)
Subject: Don't show 'unlock at boot' for file encryption
X-Git-Tag: android-x86-7.1-r1~1392^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fb4c583dba1fb8885ff9369bdab916eaa61b42bd;p=android-x86%2Fpackages-apps-Settings.git

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 03a3fef3f2..42ae602341 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -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;