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

Commit e833710e authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

Merge "Don't crash bmgr if there are no available restore sets"

parents 03476ddb 7a0fc877

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

+7 −5
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ public final class Bmgr { 
            if (err == 0) {

                observer.waitForCompletion();

                sets = observer.sets;

                if (sets != null) {

                    for (RestoreSet s : sets) {

                        if (s.token == token) {

                            System.out.println("Scheduling restore: " + s.name);
@@ -397,6 +398,7 @@ public final class Bmgr { 
                        }

                    }

                }

            }

            if (!didRestore) {

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

                    System.out.println("No available restore sets; no restore performed");