commit d1e5ddaf4d4ab5f34d3a94984b8f61477f1a00ce
author Fabrice Di Meglio <fdimeglio@google.com> Fri Oct 01 11:35:37 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 01 11:35:37 2010 -0700
tree 547defc62ede0ccd0d9b3d8d71f004f70871cef6
parent aafe912e8364b6e5503180b16d26f1d53818721a
parent 797bb4f83dfcaf263c72b760dfa279e3fbb8d545

am 797bb4f8: am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread

Merge commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545'

* commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545':
  Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
index 39b3a20..37c8ad0 100644
--- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
+++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java
@@ -34,7 +34,6 @@
 
     private String[] mArgs;
     private int mNextArg;
-    private String mCurArgData;
 
     public static void main(String[] args) {
         try {
@@ -274,6 +273,10 @@
     }
 
     private void printRestoreSets(RestoreSet[] sets) {
+        if (sets == null || sets.length == 0) {
+            System.out.println("No restore sets");
+            return;
+        }
         for (RestoreSet s : sets) {
             System.out.println("  " + Long.toHexString(s.token) + " : " + s.name);
         }