Merge "Add Device Owner CtsVerifier test for device admin settings" into mnc-dev
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 43afa87..d7ff938 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -1727,6 +1727,17 @@
<string name="activity_not_found">No activity found to handle intent: %s</string>
<string name="open_settings_button_label">Open Application Settings</string>
<string name="finish_button_label">Finish</string>
+ <string name="device_owner_device_admin_visible">Device administrator settings</string>
+ <string name="device_owner_device_admin_visible_info">
+ Please press the Go button to open the Security page in Settings.
+ Navigate to Device administrators and confirm that:\n
+ \n
+ - \"CTS Verifier - AfW Admin\" exists and is activated.\n
+ - \"CTS Verifier - AfW Admin\" cannot be disabled.\n
+ \n
+ Use the Back button to return to this page.
+ </string>
+ <string name="device_owner_device_admin_visible_go">Go</string>
<!-- Strings for JobScheduler Tests -->
<string name="js_test_description">This test is mostly automated, but requires some user interaction. You can pass this test once the list items below are checked.</string>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
index e6bbdee..4c0c59c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
@@ -66,6 +66,7 @@
static final String EXTRA_SETTING = "extra-setting";
private static final String CHECK_DEVICE_OWNER_TEST_ID = "CHECK_DEVICE_OWNER";
+ private static final String DEVICE_ADMIN_SETTINGS_ID = "DEVICE_ADMIN_SETTINGS";
private static final String WIFI_LOCKDOWN_TEST_ID = WifiLockdownTestActivity.class.getName();
private static final String DISABLE_STATUS_BAR_TEST_ID = "DISABLE_STATUS_BAR";
private static final String DISABLE_KEYGUARD_TEST_ID = "DISABLE_KEYGUARD";
@@ -132,6 +133,16 @@
new Intent(this, CommandReceiver.class)
.putExtra(EXTRA_COMMAND, COMMAND_CHECK_DEVICE_OWNER)
));
+
+ // device admin settings
+ adapter.add(createInteractiveTestItem(this, DEVICE_ADMIN_SETTINGS_ID,
+ R.string.device_owner_device_admin_visible,
+ R.string.device_owner_device_admin_visible_info,
+ new ButtonInfo(
+ R.string.device_owner_device_admin_visible_go,
+ new Intent(Settings.ACTION_SECURITY_SETTINGS))));
+
+ // WiFi Lock down tests
PackageManager packageManager = getPackageManager();
if (packageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
adapter.add(createTestItem(this, WIFI_LOCKDOWN_TEST_ID,
