diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-06-23 01:38:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-23 01:38:06 +0000 |
| commit | e57251c0fd63c43bb33c39d818a9bfe57a13f4a7 (patch) | |
| tree | 5fe7bdef50b32d73f182f4b5936cd602263d7ab6 | |
| parent | f10532477eda241da2c95f0a8f293f8b8dbd1d3d (diff) | |
| parent | 0f05f74c78197a9fff223b35e4dd30dc8480f8e3 (diff) | |
| download | cts-e57251c0fd63c43bb33c39d818a9bfe57a13f4a7.tar.gz | |
Merge "Add TV specific instructions for "Remove device owner" related tests" into tm-dev
3 files changed, 9 insertions, 2 deletions
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml index 88c7c03541c..04a857632a2 100644 --- a/apps/CtsVerifier/res/values/strings.xml +++ b/apps/CtsVerifier/res/values/strings.xml @@ -3755,6 +3755,11 @@ You should be prompted to select credentials; choose the ones you just installed Device Owner. Then press the button below, and check that CTSVerifier is NOT Device Owner anymore. </string> + <string name="device_owner_remove_device_owner_test_info_on_tv"> + Please check in Settings > Privacy > Security & Restrictions > Device Administrators if CTSVerifier is + Device Owner. Then press the button below, and check that CTSVerifier is NOT Device + Owner anymore. + </string> <string name="remove_device_owner_button">Remove device owner</string> <string name="device_owner_check_device_owner_test">Check device owner</string> <string name="device_owner_check_profile_owner_test">Check profile owner</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 ba97979adf5..1110b0f33e0 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java @@ -679,7 +679,8 @@ public class DeviceOwnerPositiveTestActivity extends PassFailButtons.TestListAct // removeDeviceOwner adapter.add(createInteractiveTestItem(this, REMOVE_DEVICE_OWNER_TEST_ID, R.string.device_owner_remove_device_owner_test, - R.string.device_owner_remove_device_owner_test_info, + Utils.isTV(this) ? R.string.device_owner_remove_device_owner_test_info_on_tv + : R.string.device_owner_remove_device_owner_test_info, new ButtonInfo( R.string.remove_device_owner_button, createTearDownIntent()))); diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java index 4a4eae4f76f..40eefea2d7b 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java @@ -240,7 +240,8 @@ public class DeviceOwnerRequestingBugreportTestActivity extends PassFailButtons. // removeDeviceOwner adapter.add(createInteractiveTestItem(this, REMOVE_DEVICE_OWNER_TEST_ID, R.string.device_owner_remove_device_owner_test, - R.string.device_owner_remove_device_owner_test_info, + Utils.isTV(this) ? R.string.device_owner_remove_device_owner_test_info_on_tv + : R.string.device_owner_remove_device_owner_test_info, new ButtonInfo( R.string.remove_device_owner_button, createTearDownIntent()))); |