summaryrefslogtreecommitdiffstats
path: root/cmds/bmgr/src/com/android/commands
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2010-06-09 12:21:31 -0700
committerChristopher Tate <ctate@google.com>2010-06-09 12:21:31 -0700
commit7e76ff1c409bc22e89ed09ef90161164dae40838 (patch)
treefdb5a34ac33b3c79228bd3fb080deb396814ff7b /cmds/bmgr/src/com/android/commands
parent55f8209da3048768a6dc24929dec8798e8ddf077 (diff)
downloadframeworks_base-7e76ff1c409bc22e89ed09ef90161164dae40838.zip
frameworks_base-7e76ff1c409bc22e89ed09ef90161164dae40838.tar.gz
frameworks_base-7e76ff1c409bc22e89ed09ef90161164dae40838.tar.bz2
Fail gracefully if the user fails to supply necessary args to bmgr
Fixes bug #2755355 Change-Id: I4690756bb5077a6b4bbbfb232cd852cad43cef77
Diffstat (limited to 'cmds/bmgr/src/com/android/commands')
-rw-r--r--cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
index 8263e75..39b3a20 100644
--- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
+++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
@@ -175,6 +175,11 @@ public final class Bmgr {
private void doTransport() {
try {
String which = nextArg();
+ if (which == null) {
+ showUsage();
+ return;
+ }
+
String old = mBmgr.selectBackupTransport(which);
if (old == null) {
System.out.println("Unknown transport '" + which
@@ -318,6 +323,11 @@ public final class Bmgr {
private void doRestore() {
String arg = nextArg();
+ if (arg == null) {
+ showUsage();
+ return;
+ }
+
if (arg.indexOf('.') >= 0) {
// it's a package name
doRestorePackage(arg);