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

Don't crash if the Backup Manager returns a null RestoreSet[]

Browse Source
This commit is contained in:
Christopher Tate
2009-08-07 15:40:35 -07:00
parent b99ab30cbc
commit 84780f56f4
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,12 +311,14 @@ public final class Bmgr {
return;
}
RestoreSet[] sets = mRestore.getAvailableRestoreSets();
for (RestoreSet s : sets) {
if (s.token == token) {
System.out.println("Scheduling restore: " + s.name);
mRestore.performRestore(token, observer);
didRestore = true;
break;
if (sets != null) {
for (RestoreSet s : sets) {
if (s.token == token) {
System.out.println("Scheduling restore: " + s.name);
mRestore.performRestore(token, observer);
didRestore = true;
break;
}
}
}
if (!didRestore) {