diff options
| author | Christopher Tate <ctate@google.com> | 2010-04-06 12:43:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 12:43:23 -0700 |
| commit | b93107daad8f839b4b234b24af475092168fac89 (patch) | |
| tree | f7d0919aa6ce0c600603ee09f660c2dcd2dd6616 /cmds | |
| parent | cbc7fe0df6774621206b0ccbb85294bc4d2d70ed (diff) | |
| parent | ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7 (diff) | |
| download | frameworks_base-b93107daad8f839b4b234b24af475092168fac89.zip frameworks_base-b93107daad8f839b4b234b24af475092168fac89.tar.gz frameworks_base-b93107daad8f839b4b234b24af475092168fac89.tar.bz2 | |
am ccb2c6cf: am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo
Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken
* commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7':
Fix 'bmgr restore'
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java index 5612158..8263e75 100644 --- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java +++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java @@ -373,7 +373,7 @@ public final class Bmgr { } RestoreSet[] sets = null; int err = mRestore.getAvailableRestoreSets(observer); - if (err != 0) { + if (err == 0) { observer.waitForCompletion(); sets = observer.sets; for (RestoreSet s : sets) { |