From 0fe45dea927dc87c19d6afd4502658b36177aa07 Mon Sep 17 00:00:00 2001 From: Andy Stadler Date: Thu, 20 Jan 2011 16:35:09 -0800 Subject: [PATCH] Read actual device encryption status Bug: 3346770 Change-Id: Ie70c14b1b4584a5f340a27102145f7860ba9e14b --- .../com/android/server/DevicePolicyManagerService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 8a9e351800468..b2d534b643707 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -53,6 +53,7 @@ import android.os.RemoteCallback; import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; +import android.os.SystemProperties; import android.provider.Settings; import android.util.PrintWriterPrinter; import android.util.Printer; @@ -1925,7 +1926,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { * {@link DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE}. */ private int getEncryptionStatus() { - return DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED; + String status = SystemProperties.get("ro.crypto.state", "unsupported"); + if ("encrypted".equalsIgnoreCase(status)) { + return DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE; + } else if ("unencrypted".equalsIgnoreCase(status)) { + return DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE; + } else { + return DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED; + } } /**