Add device info field for encryption
bug: 17792300
Change-Id: I3f974e415628aa37eb553a0851595ba0c50d65d2
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java
index 1eb4acb..62c268d 100644
--- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java
+++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java
@@ -68,4 +68,5 @@
public static final String SERIAL_NUMBER = "deviceID";
public static final String STORAGE_DEVICES = "storage_devices";
public static final String MULTI_USER = "multi_user";
+ public static final String ENCRYPTED = "encrypted";
}
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
index 19349e5..52ddfe9 100644
--- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
+++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
@@ -149,6 +149,9 @@
// Multi-user support
addResult(MULTI_USER, getMultiUserInfo());
+ // Encrypted
+ addResult(ENCRYPTED, getEncrypted());
+
finish(Activity.RESULT_OK, mResults);
}
@@ -394,4 +397,29 @@
return "unknown";
}
+
+ private static String getProperty(String property)
+ throws IOException {
+ Process process = new ProcessBuilder("getprop", property).start();
+ Scanner scanner = null;
+ String line = "";
+ try {
+ scanner = new Scanner(process.getInputStream());
+ line = scanner.nextLine();
+ } finally {
+ if (scanner != null) {
+ scanner.close();
+ }
+ }
+ return line;
+ }
+
+ private int getEncrypted() {
+ try {
+ return "encrypted".equals(getProperty("ro.crypto.state")) ? 1 : 0;
+ } catch (IOException e) {
+ }
+
+ return 0;
+ }
}