| commit | 22bf2a6e1472a3308e3c41b4dea45763874e79be | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Fri Apr 13 12:46:54 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 13 12:46:54 2012 -0700 |
| tree | eda2308358fcedc80929b24067a0659584ca8f96 | |
| parent | c6afc7a7e0131f9186434604ba92adc37ce7196d [diff] | |
| parent | a23b343299783e5990370579cfc7d93e62dacb8d [diff] |
Merge "Fix full backup/restore detection of encrypted devices"
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; } }