diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-12 18:17:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-12 18:17:21 +0000 |
| commit | 406711c783cb5034b71c8ba0d7e3805035eb4522 (patch) | |
| tree | 23b95f41b4f5d3edd849d8ca85a855b9ff3078c6 /apps | |
| parent | f21cc678fd2a8ed19bf33fdc32163c12244cb57d (diff) | |
| parent | 90fb2c1f9be7045fd08630b25fbafdf43ab22c6a (diff) | |
| download | cts-406711c783cb5034b71c8ba0d7e3805035eb4522.tar.gz | |
Merge "Merge "Adjust the instructions of "Disallow factory reset"" into android12-tests-dev am: 42bfd89db7" into android12L-tests-dev am: 90fb2c1f9b
Original change: https://android-review.googlesource.com/c/platform/cts/+/2991618
Change-Id: I70ee5111b8964fea473c66e2c0a4d278a98673e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/CtsVerifier/res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml index 5aa2b91fd7c..016917d9384 100644 --- a/apps/CtsVerifier/res/values/strings.xml +++ b/apps/CtsVerifier/res/values/strings.xml @@ -4173,7 +4173,7 @@ You should be prompted to select credentials; choose the ones you just installed 2. Go to OEM unlocking settings, if this device has this Settings option. It is often located under \"Developer options\".\n Confirm that:\n - Oem Unlocking is disabled.\n - - Enabling Oem unlocking is not possible and triggers a support message.\n\n + - Enabling Oem unlocking is not possible, and pressing the button or menu option to enable it triggers a support message (if pressing is possible).\n\n Return back to this page. </string> <string name="device_owner_user_restriction_set">Set restriction</string> |