diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-08-21 08:43:41 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2014-08-22 11:22:43 -0700 |
| commit | 32d06732cdb7ee653a58e49a4dab13a780513db5 (patch) | |
| tree | e7915fe34e031d09fa3e746f3504b22163b7ef99 /packages/BackupRestoreConfirmation/res | |
| parent | f9220b39533d18b6c79099c32522b3ff712ff89b (diff) | |
| download | frameworks_base-32d06732cdb7ee653a58e49a4dab13a780513db5.zip frameworks_base-32d06732cdb7ee653a58e49a4dab13a780513db5.tar.gz frameworks_base-32d06732cdb7ee653a58e49a4dab13a780513db5.tar.bz2 | |
Fix adb backup for encrypted case
New behavior. Backup no longer uses the encryption password. This is in
part because that is hard with patterns, in part because it is a security
issue - the off line backup is much easier to brute force than the phone.
Instead, we simply insist on an encryption password if your device is encrypted
and locked.
Bug: 17159330
Change-Id: Ia22f84722522abf0b569a3ef1e16ead5527c726d
Diffstat (limited to 'packages/BackupRestoreConfirmation/res')
| -rw-r--r-- | packages/BackupRestoreConfirmation/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/BackupRestoreConfirmation/res/values/strings.xml b/packages/BackupRestoreConfirmation/res/values/strings.xml index 5c90fd0..3fb3fd4 100644 --- a/packages/BackupRestoreConfirmation/res/values/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values/strings.xml @@ -44,6 +44,8 @@ <string name="backup_enc_password_text">Please enter a password to use for encrypting the full backup data. If this is left blank, your current backup password will be used:</string> <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. --> <string name="backup_enc_password_optional">If you wish to encrypt the full backup data, enter a password below:</string> + <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. --> + <string name="backup_enc_password_required">Since your device is encrypted, you are required to encrypt your backup. Please enter a password below:</string> <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. --> <string name="restore_enc_password_text">If the restore data is encrypted, please enter the password below:</string> |