drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use the correct method to check if device is encrypted" into lmp-dev

Browse Source
This commit is contained in:
Amith Yamasani
2014-10-17 18:55:57 +00:00
committed by Android (Google) Code Review
parent af8de90fd6 cd410ba4e8
commit a865bb5df8
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -728,12 +728,9 @@ public class LockPatternUtils {
/** Update the encryption password if it is enabled **/ /** Update the encryption password if it is enabled **/
private void updateEncryptionPassword(final int type, final String password) { private void updateEncryptionPassword(final int type, final String password) {
DevicePolicyManager dpm = getDevicePolicyManager(); if (!isDeviceEncryptionEnabled()) {
if (dpm.getStorageEncryptionStatus(getCurrentOrCallingUserId())
!= DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE) {
return; return;
} }
final IBinder service = ServiceManager.getService("mount"); final IBinder service = ServiceManager.getService("mount");
if (service == null) { if (service == null) {
Log.e(TAG, "Could not find the mount service to update the encryption password"); Log.e(TAG, "Could not find the mount service to update the encryption password");

11
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@ -3390,9 +3390,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
private int getEncryptionStatus() { private int getEncryptionStatus() {
String status = SystemProperties.get("ro.crypto.state", "unsupported"); String status = SystemProperties.get("ro.crypto.state", "unsupported");
if ("encrypted".equalsIgnoreCase(status)) { if ("encrypted".equalsIgnoreCase(status)) {
return LockPatternUtils.isDeviceEncrypted() final long token = Binder.clearCallingIdentity();
? DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE try {
: DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE; return LockPatternUtils.isDeviceEncrypted()
? DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE
: DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;
} finally {
Binder.restoreCallingIdentity(token);
}
} else if ("unencrypted".equalsIgnoreCase(status)) { } else if ("unencrypted".equalsIgnoreCase(status)) {
return DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE; return DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;
} else { } else {