| commit | a23b343299783e5990370579cfc7d93e62dacb8d | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Thu Apr 12 16:38:02 2012 -0700 |
| committer | Christopher Tate <ctate@google.com> | Thu Apr 12 17:52:03 2012 -0700 |
| tree | e0050572e321d7b3bbf1ac22e0e84a93bc13bfb0 | |
| parent | 9492947a5970325c494872324078b898868b9403 [diff] |
Fix full backup/restore detection of encrypted devices The confirmation UI did not request the needed permission, so was failing to communicate with the mount service; as a "safe" failure mode, it was assuming the device was encrypted. Fixed; now it presents the correct prompt text for the device's encryption state. Bug 5958195 Change-Id: Ic03db16673b89d3377e0362a09cf51bfb572d78b
diff --git a/packages/BackupRestoreConfirmation/AndroidManifest.xml b/packages/BackupRestoreConfirmation/AndroidManifest.xml index f3feee8..4fb26ae 100644 --- a/packages/BackupRestoreConfirmation/AndroidManifest.xml +++ b/packages/BackupRestoreConfirmation/AndroidManifest.xml
@@ -19,6 +19,7 @@ package="com.android.backupconfirm" > <uses-permission android:name="android.permission.BACKUP" /> + <uses-permission android:name="android.permission.CRYPT_KEEPER" /> <application android:allowClearUserData="false" android:allowBackup="false"
diff --git a/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java b/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java index 7f1d059..82ac8cb 100644 --- a/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java +++ b/packages/BackupRestoreConfirmation/src/com/android/backupconfirm/BackupRestoreConfirmation.java
@@ -265,6 +265,7 @@ } catch (Exception e) { // If we can't talk to the mount service we have a serious problem; fail // "secure" i.e. assuming that the device is encrypted. + Slog.e(TAG, "Unable to communicate with mount service: " + e.getMessage()); return true; } }