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

Add some error reporting & info to bmgr's output

Browse Source
This commit is contained in:
Christopher Tate
2009-06-26 11:41:26 -07:00
parent 56bc71565e
commit c73a218c26
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) { if (sets == null || sets.length == 0) {
System.out.println("No restore sets available"); System.out.println("No restore sets available");
} else { } else {
for (RestoreSet s : sets) { printRestoreSets(sets);
System.out.println(" " + s.token + " : " + s.name);
}
} }
} catch (RemoteException e) { } catch (RemoteException e) {
System.err.println(e.toString()); 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 { class RestoreObserver extends IRestoreObserver.Stub {
boolean done; boolean done;
public void restoreStarting(int numPackages) { public void restoreStarting(int numPackages) {
@@ -212,6 +216,7 @@ public final class Bmgr {
RestoreObserver observer = new RestoreObserver(); RestoreObserver observer = new RestoreObserver();
try { try {
boolean didRestore = false;
int curTransport = mBmgr.getCurrentTransport(); int curTransport = mBmgr.getCurrentTransport();
mRestore = mBmgr.beginRestoreSession(curTransport); mRestore = mBmgr.beginRestoreSession(curTransport);
if (mRestore == null) { if (mRestore == null) {
@@ -223,9 +228,18 @@ public final class Bmgr {
if (s.token == token) { if (s.token == token) {
System.out.println("Scheduling restore: " + s.name); System.out.println("Scheduling restore: " + s.name);
mRestore.performRestore(token, observer); mRestore.performRestore(token, observer);
didRestore = true;
break; 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(); mRestore.endRestoreSession();
} catch (RemoteException e) { } catch (RemoteException e) {
System.err.println(e.toString()); System.err.println(e.toString());