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

Commit a3921c7b authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "dump method should accept --proto and --debug flag regardless of the... 

Merge "dump method should accept --proto and --debug flag regardless of the order Bug:69006241" into ub-launcher3-master
parents 1dc8a1f3 8fe56a6a

src/com/android/launcher3/model/BgDataModel.java

+4 −4
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class BgDataModel { 


    public synchronized void dump(String prefix, FileDescriptor fd, PrintWriter writer,

            String[] args) {

        if (args.length > 0 && TextUtils.equals(args[0], "--proto")) {

        if (Arrays.asList(args).contains("--proto")) {

            dumpProto(prefix, fd, writer, args);

            return;

        }
@@ -219,7 +219,7 @@ public class BgDataModel { 
            targetList.addAll(workspaces.valueAt(i).getFlattenedList());

        }



        if (args.length > 1 && TextUtils.equals(args[1], "--debug")) {

        if (Arrays.asList(args).contains("--debug")) {

            for (int i = 0; i < targetList.size(); i++) {

                writer.println(prefix + DumpTargetWrapper.getDumpTargetStr(targetList.get(i)));

            }