PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Paul Lawrence
2016-02-02 21:54:06 +00:00
committed by Android (Google) Code Review
parent b9c70a11f2 fb4c583dba
commit 446b78cd52
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/ChooseLockGeneric.java
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;