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

am c73a218c: Add some error reporting & info to bmgr\'s output

Browse Source 
Merge commit 'c73a218c2663e6ae3ec8a9ab8b9524f95702ade9'

* commit 'c73a218c2663e6ae3ec8a9ab8b9524f95702ade9':
  Add some error reporting & info to bmgr's output
This commit is contained in:
Christopher Tate
2009-06-29 16:36:48 -07:00
committed by The Android Open Source Project
parent b5fba86e4c c73a218c26
commit c16dee2aaa
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,9 +171,7 @@ public final class Bmgr {
if (sets == null || sets.length == 0) {
System.out.println("No restore sets available");
} else {
for (RestoreSet s : sets) {
System.out.println(" " + s.token + " : " + s.name);
}
printRestoreSets(sets);
}
} catch (RemoteException e) {
System.err.println(e.toString());
@@ -181,6 +179,12 @@ public final class Bmgr {
}
}
private void printRestoreSets(RestoreSet[] sets) {
for (RestoreSet s : sets) {
System.out.println(" " + s.token + " : " + s.name);
}
}
class RestoreObserver extends IRestoreObserver.Stub {
boolean done;
public void restoreStarting(int numPackages) {
@@ -212,6 +216,7 @@ public final class Bmgr {
RestoreObserver observer = new RestoreObserver();
try {
boolean didRestore = false;
int curTransport = mBmgr.getCurrentTransport();
mRestore = mBmgr.beginRestoreSession(curTransport);
if (mRestore == null) {
@@ -223,9 +228,18 @@ public final class Bmgr {
if (s.token == token) {
System.out.println("Scheduling restore: " + s.name);
mRestore.performRestore(token, observer);
didRestore = true;
break;
}
}
if (!didRestore) {
if (sets == null || sets.length == 0) {
System.out.println("No available restore sets; no restore performed");
} else {
System.out.println("No matching restore set token. Available sets:");
printRestoreSets(sets);
}
}
mRestore.endRestoreSession();
} catch (RemoteException e) {
System.err.println(e.toString());