From d5965cb506bde84612109bf26c3fcc6712ca91e5 Mon Sep 17 00:00:00 2001
From: Sascha Prueter <saschap@google.com>
Date: Tue, 19 Nov 2013 06:51:21 +0000
Subject: Trying to unbreak build...

Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
---
 cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'cmds/bmgr')

diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
index db3d8bb..2666b41 100644
--- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
+++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
@@ -187,12 +187,6 @@ public final class Bmgr {
     }
 
     private void doWipe() {
-        String transport = nextArg();
-        if (transport == null) {
-            showUsage();
-            return;
-        }
-
         String pkg = nextArg();
         if (pkg == null) {
             showUsage();
@@ -200,8 +194,8 @@ public final class Bmgr {
         }
 
         try {
-            mBmgr.clearBackupData(transport, pkg);
-            System.out.println("Wiped backup data for " + pkg + " on " + transport);
+            mBmgr.clearBackupData(pkg);
+            System.out.println("Wiped backup data for " + pkg);
         } catch (RemoteException e) {
             System.err.println(e.toString());
             System.err.println(BMGR_NOT_RUNNING_ERR);
@@ -452,7 +446,7 @@ public final class Bmgr {
         System.err.println("       bmgr restore TOKEN PACKAGE...");
         System.err.println("       bmgr restore PACKAGE");
         System.err.println("       bmgr run");
-        System.err.println("       bmgr wipe TRANSPORT PACKAGE");
+        System.err.println("       bmgr wipe PACKAGE");
         System.err.println("");
         System.err.println("The 'backup' command schedules a backup pass for the named package.");
         System.err.println("Note that the backup pass will effectively be a no-op if the package");
@@ -468,8 +462,8 @@ public final class Bmgr {
         System.err.println("");
         System.err.println("The 'list transports' command reports the names of the backup transports");
         System.err.println("currently available on the device.  These names can be passed as arguments");
-        System.err.println("to the 'transport' and 'wipe' commands.  The currently selected transport");
-        System.err.println("is indicated with a '*' character.");
+        System.err.println("to the 'transport' command.  The currently selected transport is indicated");
+        System.err.println("with a '*' character.");
         System.err.println("");
         System.err.println("The 'list sets' command reports the token and name of each restore set");
         System.err.println("available to the device via the current transport.");
@@ -497,8 +491,7 @@ public final class Bmgr {
         System.err.println("data changes.");
         System.err.println("");
         System.err.println("The 'wipe' command causes all backed-up data for the given package to be");
-        System.err.println("erased from the given transport's storage.  The next backup operation");
+        System.err.println("erased from the current transport's storage.  The next backup operation");
         System.err.println("that the given application performs will rewrite its entire data set.");
-        System.err.println("Transport names to use here are those reported by 'list transports'.");
     }
 }
-- 
cgit v1.1