diff options
| author | Chris Tate <ctate@google.com> | 2011-01-09 13:04:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-09 13:04:01 -0800 |
| commit | 9b1bd2c7d1acffa1079d589811450140518e5ce5 (patch) | |
| tree | 1de29f3463ac2962b2dff7f0bcbe23e88dc6607f /cmds | |
| parent | 412ebd6f9d18eebc11d8473318316aef1dfc5caa (diff) | |
| parent | 6ec91731cbf6ee1a9a914d341fab9567d1599018 (diff) | |
| download | frameworks_base-9b1bd2c7d1acffa1079d589811450140518e5ce5.zip frameworks_base-9b1bd2c7d1acffa1079d589811450140518e5ce5.tar.gz frameworks_base-9b1bd2c7d1acffa1079d589811450140518e5ce5.tar.bz2 | |
am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
* commit '6ec91731cbf6ee1a9a914d341fab9567d1599018':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java index 37c8ad0..a1cc4ce 100644 --- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java +++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java @@ -217,8 +217,7 @@ public final class Bmgr { // The rest of the 'list' options work with a restore session on the current transport try { - String curTransport = mBmgr.getCurrentTransport(); - mRestore = mBmgr.beginRestoreSession(curTransport); + mRestore = mBmgr.beginRestoreSession(null, null); if (mRestore == null) { System.err.println(BMGR_NOT_RUNNING_ERR); return; @@ -349,8 +348,7 @@ public final class Bmgr { private void doRestorePackage(String pkg) { try { - String curTransport = mBmgr.getCurrentTransport(); - mRestore = mBmgr.beginRestoreSession(curTransport); + mRestore = mBmgr.beginRestoreSession(pkg, null); if (mRestore == null) { System.err.println(BMGR_NOT_RUNNING_ERR); return; @@ -378,8 +376,7 @@ public final class Bmgr { try { boolean didRestore = false; - String curTransport = mBmgr.getCurrentTransport(); - mRestore = mBmgr.beginRestoreSession(curTransport); + mRestore = mBmgr.beginRestoreSession(null, null); if (mRestore == null) { System.err.println(BMGR_NOT_RUNNING_ERR); return; |