Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't crash bmgr if there are no available restore sets"

Browse Source
This commit is contained in:
Chris Tate
2010-11-01 15:53:45 -07:00
committed by Android (Google) Code Review
parent 03476ddba6 7a0fc87767
commit e833710e68
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
View File

@@ -389,11 +389,13 @@ public final class Bmgr {
if (err == 0) {
observer.waitForCompletion();
sets = observer.sets;
for (RestoreSet s : sets) {
if (s.token == token) {
System.out.println("Scheduling restore: " + s.name);
didRestore = (mRestore.restoreAll(token, observer) == 0);
break;
if (sets != null) {
for (RestoreSet s : sets) {
if (s.token == token) {
System.out.println("Scheduling restore: " + s.name);
didRestore = (mRestore.restoreAll(token, observer) == 0);
break;
}
}
}
}