diff options
| author | Christopher Tate <ctate@google.com> | 2011-06-03 17:39:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-03 17:39:27 -0700 |
| commit | d00ea44b314bbeaaa696e63184accb58964b0ff7 (patch) | |
| tree | 4c590e3e77aee11bd2f68705080d818e71caad76 /packages | |
| parent | 03133d50a39e0793c2d7f6f5399d2928aac5e057 (diff) | |
| parent | a858cb075d0c87e2965d401656ff2d5bc16406da (diff) | |
| download | frameworks_base-d00ea44b314bbeaaa696e63184accb58964b0ff7.zip frameworks_base-d00ea44b314bbeaaa696e63184accb58964b0ff7.tar.gz frameworks_base-d00ea44b314bbeaaa696e63184accb58964b0ff7.tar.bz2 | |
Merge "Respect android:allowBackup="false" during full backup & restore"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/BackupRestoreConfirmation/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/BackupRestoreConfirmation/AndroidManifest.xml b/packages/BackupRestoreConfirmation/AndroidManifest.xml index ed9a519..19848f6 100644 --- a/packages/BackupRestoreConfirmation/AndroidManifest.xml +++ b/packages/BackupRestoreConfirmation/AndroidManifest.xml @@ -21,7 +21,7 @@ <uses-permission android:name="android.permission.BACKUP" /> <application android:allowClearUserData="false" - android:killAfterRestore="false" + android:allowBackup="false" android:permission="android.permission.CONFIRM_FULL_BACKUP" > <activity android:name=".BackupRestoreConfirmation" |