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

Merge "Read actual device encryption status" into honeycomb

Browse Source
This commit is contained in:
Andy Stadler
2011-01-21 10:27:46 -08:00
committed by Android (Google) Code Review
parent 500657387d 0fe45dea92
commit c2ff2ec0d9
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/DevicePolicyManagerService.java
View File

@@ -53,6 +53,7 @@ import android.os.RemoteCallback;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties;
import android.provider.Settings; import android.provider.Settings;
import android.util.PrintWriterPrinter; import android.util.PrintWriterPrinter;
import android.util.Printer; import android.util.Printer;
@@ -1925,7 +1926,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
* {@link DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE}. * {@link DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE}.
*/ */
private int getEncryptionStatus() { 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;
}
} }
/** /**