Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev

Browse Source 
* commit 'a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
  Add utility methods to LockPatternUtils for encryption
This commit is contained in:
Jim Miller
2014-10-17 23:57:33 +00:00
committed by Android Git Automerger
parent a801d34911 a054a8280c
commit d9b81b11b9
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -560,9 +560,7 @@ public class LockPatternUtils {
// Update the device encryption password. // Update the device encryption password.
if (userId == UserHandle.USER_OWNER if (userId == UserHandle.USER_OWNER
&& LockPatternUtils.isDeviceEncryptionEnabled()) { && LockPatternUtils.isDeviceEncryptionEnabled()) {
final ContentResolver cr = mContext.getContentResolver(); final boolean required = isCredentialRequiredToDecrypt(true);
final boolean required = Settings.Global.getInt(cr,
Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, 1) == 1 ? true : false;
if (!required) { if (!required) {
clearEncryptionPassword(); clearEncryptionPassword();
} else { } else {
@@ -793,10 +791,7 @@ public class LockPatternUtils {
// Update the device encryption password. // Update the device encryption password.
if (userHandle == UserHandle.USER_OWNER if (userHandle == UserHandle.USER_OWNER
&& LockPatternUtils.isDeviceEncryptionEnabled()) { && LockPatternUtils.isDeviceEncryptionEnabled()) {
final ContentResolver cr = mContext.getContentResolver(); if (!isCredentialRequiredToDecrypt(true)) {
final boolean required = Settings.Global.getInt(cr,
Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, 1) == 1 ? true : false;
if (!required) {
clearEncryptionPassword(); clearEncryptionPassword();
} else { } else {
boolean numeric = computedQuality boolean numeric = computedQuality
@@ -1658,4 +1653,19 @@ public class LockPatternUtils {
private void onAfterChangingPassword() { private void onAfterChangingPassword() {
getTrustManager().reportEnabledTrustAgentsChanged(getCurrentOrCallingUserId()); getTrustManager().reportEnabledTrustAgentsChanged(getCurrentOrCallingUserId());
} }
public boolean isCredentialRequiredToDecrypt(boolean defaultValue) {
final int value = Settings.Global.getInt(mContentResolver,
Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, -1);
return value == -1 ? defaultValue : (value != 0);
}
public void setCredentialRequiredToDecrypt(boolean required) {
if (getCurrentUser() != UserHandle.USER_OWNER) {
Log.w(TAG, "Only device owner may call setCredentialRequiredForDecrypt()");
return;
}
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT, required ? 1 : 0);
}
} }