Remove encryption test from profile owner provisioning test.
After b/17881324 (ag/569169), it is no longer possible to know if
full disk encryption is enabled or not, because an encryption-enabled
device without PIN/pattern is treated as not-encrypted by DPM API,
which is what profile owner provisioning mandates.
Bug: 17384646
Change-Id: I4acacf8e8059b288e49b105b24ae4a8c9781477f
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
index da823e8..6a9de44 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
@@ -69,7 +69,6 @@
protected DevicePolicyManager mDevicePolicyManager;
private TestItem mProfileOwnerInstalled;
- private TestItem mDiskEncryptionTest;
private TestItem mProfileVisibleTest;
private TestItem mDeviceAdminVisibleTest;
private TestItem mWorkAppVisibleTest;
@@ -155,13 +154,6 @@
}
};
- mDiskEncryptionTest = new TestItem(this, R.string.provisioning_byod_diskencryption) {
- @Override
- public TestResult getPassFailState() {
- return isDeviceEncrypted() ? TestResult.Passed : TestResult.Failed;
- }
- };
-
mProfileVisibleTest = new TestItem(this, R.string.provisioning_byod_profile_visible,
R.string.provisioning_byod_profile_visible_instruction,
new Intent(Settings.ACTION_SETTINGS));
@@ -181,7 +173,6 @@
R.string.provisioning_byod_cross_profile_instruction,
chooser);
- mTests.add(mDiskEncryptionTest);
mTests.add(mProfileOwnerInstalled);
mTests.add(mProfileVisibleTest);
mTests.add(mDeviceAdminVisibleTest);
@@ -284,11 +275,6 @@
PackageManager.DONT_KILL_APP);
}
- private boolean isDeviceEncrypted() {
- return mDevicePolicyManager.getStorageEncryptionStatus()
- == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE;
- }
-
private void showToast(int messageId) {
String message = getString(messageId);
Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
