LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am d8865cc3: Update demo for DPM encryption controls

Browse Source 
* commit 'd8865cc32c917cebf1fc65c8266d939b9a5718a7':
  Update demo for DPM encryption controls
This commit is contained in:
Andy Stadler
2011-01-17 12:56:21 -08:00
committed by Android Git Automerger
parent ecae4533f2 d8865cc32c
commit f056c22cf7
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
View File

@@ -847,7 +847,7 @@ public class DeviceAdminSample extends DeviceAdminReceiver {
builder.show();
return;
}
if (mDPM.getStorageEncryption(mDeviceAdminSample) ==
if (mDPM.getStorageEncryptionStatus() ==
DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED) {
AlertDialog.Builder builder = new AlertDialog.Builder(Controller.this);
builder.setMessage("Encryption is unsupported on this device.");
@@ -866,8 +866,18 @@ public class DeviceAdminSample extends DeviceAdminReceiver {
};
private void updateEncryptionStatus() {
boolean sampleAdminStatusValue = mDPM.getStorageEncryption(mDeviceAdminSample);
String sampleAdminStatus = Boolean.toString(sampleAdminStatusValue);
boolean adminStatusValue = mDPM.getStorageEncryption(null);
String adminStatus = Boolean.toString(adminStatusValue);
int deviceStatusCode = mDPM.getStorageEncryptionStatus();
String deviceStatus = statusCodeToString(deviceStatusCode);
mEncryptionStatus.setText("sample:" + sampleAdminStatus + " admins:" + adminStatus
+ " device:" + deviceStatus);
}
private String statusCodeToString(int newStatusCode) {
String newStatus = "unknown";
int newStatusCode = mDPM.getStorageEncryption(mDeviceAdminSample);
switch (newStatusCode) {
case DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED:
newStatus = "unsupported";
@@ -875,9 +885,6 @@ public class DeviceAdminSample extends DeviceAdminReceiver {
case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
newStatus = "inactive";
break;
case DevicePolicyManager.ENCRYPTION_STATUS_REQUESTED:
newStatus = "requested";
break;
case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING:
newStatus = "activating";
break;
@@ -885,7 +892,7 @@ public class DeviceAdminSample extends DeviceAdminReceiver {
newStatus = "active";
break;
}
mEncryptionStatus.setText(newStatus);
return newStatus;
}
}
}