diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-06-02 16:35:38 -0400 |
|---|---|---|
| committer | Craig Lafayette <craiglafa@google.com> | 2015-06-08 10:35:12 -0400 |
| commit | 5a9b689c7fea86e85ebc269c027f8a61ef533d56 (patch) | |
| tree | bfabfd9a8e7b57910480c8e9bb981c76c866b041 /res | |
| parent | 02fbbc154a9c36ff9e7f030f63d1051add9d1909 (diff) | |
| download | android_packages_apps_ManagedProvisioning-5a9b689c7fea86e85ebc269c027f8a61ef533d56.tar.gz android_packages_apps_ManagedProvisioning-5a9b689c7fea86e85ebc269c027f8a61ef533d56.tar.bz2 android_packages_apps_ManagedProvisioning-5a9b689c7fea86e85ebc269c027f8a61ef533d56.zip | |
Remove FRP wipe via NFC bump.
- Remove the WipeResetProtectionTask
- Move FRP check to DeviceOwnerPreProvisioningActivity
Bug: 21558883
Change-Id: Ic686c72d4a3984436f1bb28c271c248fedc46091
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 539a04dd..16aefffe 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -119,8 +119,6 @@ <string name="progress_data_process">Processing setup data...</string> <!-- Progress text indicating that wifi is set up. [CHAR LIMIT=45] --> <string name="progress_connect_to_wifi">Connecting to Wi-Fi...</string> - <!-- Progress text indicating that factory reset protection is being checked. [CHAR LIMIT=65] --> - <string name="progress_wipe_frp">Checking Factory Reset Protection...</string> <!-- Progress text indicating that the device admin package is being downloaded. [CHAR LIMIT=45] --> <string name="progress_download">Downloading the admin app...</string> <!-- Progress text indicating that the device admin package is being installed. [CHAR LIMIT=45] --> @@ -147,7 +145,7 @@ <!-- Message of the error dialog when setting up wifi failed. [CHAR LIMIT=NONE] --> <string name="device_owner_error_wifi">Couldn\'t connect to Wi-Fi</string> <!-- Message of the error dialog when passing factory reset protection fails. [CHAR LIMIT=NONE] --> - <string name="device_owner_error_frp">Could not pass device factory reset protection</string> + <string name="device_owner_error_frp">This device is locked by factory reset protection. Contact your IT department.</string> <!-- Message of the error dialog when data integrity check fails. [CHAR LIMIT=NONE] --> <string name="device_owner_error_hash_mismatch">Couldn\'t use the admin app due to a checksum error. Contact your IT department.</string> <!-- Message of the error dialog when device owner apk could not be downloaded. [CHAR LIMIT=NONE] --> |