Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5afeca3 authored Oct 17, 2014 by Amith Yamasani Committed by Android Git Automerger Oct 17, 2014

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

* commit 'a865bb5d':
  Use the correct method to check if device is encrypted

parents e62a4a50 a865bb5d

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -728,12 +728,9 @@ public class LockPatternUtils {

		/ Update the encryption password if it is enabled /
		private void updateEncryptionPassword(final int type, final String password) {
		DevicePolicyManager dpm = getDevicePolicyManager();
		if (dpm.getStorageEncryptionStatus(getCurrentOrCallingUserId())
		!= DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE) {
		if (!isDeviceEncryptionEnabled()) {
		return;
		}

		final IBinder service = ServiceManager.getService("mount");
		if (service == null) {
		Log.e(TAG, "Could not find the mount service to update the encryption password");

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+8 −3

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