summaryrefslogtreecommitdiffstats
path: root/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
diff options
context:
space:
mode:
Diffstat (limited to 'cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java')
-rw-r--r--cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java12
1 files changed, 7 insertions, 5 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..b5fddfa 100644
--- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
+++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
@@ -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;
+ }
}
}
}