Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1e5ddaf authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 797bb4f8: am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets"... 

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 '797bb4f8'

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

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ public final class Bmgr { 




    private String[] mArgs;

    private String[] mArgs;

    private int mNextArg;

    private int mNextArg;

    private String mCurArgData;





    public static void main(String[] args) {

    public static void main(String[] args) {

        try {

        try {
@@ -274,6 +273,10 @@ public final class Bmgr { 
    }

    }





    private void printRestoreSets(RestoreSet[] sets) {

    private void printRestoreSets(RestoreSet[] sets) {

        if (sets == null || sets.length == 0) {

            System.out.println("No restore sets");

            return;

        }

        for (RestoreSet s : sets) {

        for (RestoreSet s : sets) {

            System.out.println("  " + Long.toHexString(s.token) + " : " + s.name);

            System.out.println("  " + Long.toHexString(s.token) + " : " + s.name);

        }

        }