From 8fe56a6a7dea0e5627e1717aace219257d10f13a Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 16 Nov 2017 15:00:10 -0800 Subject: [PATCH] dump method should accept --proto and --debug flag regardless of the order Bug:69006241 Change-Id: Idca9c65fbd1842c6bee7999ee9921cf4806c4328 --- src/com/android/launcher3/model/BgDataModel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java index 816c1d46d6..8640401328 100644 --- a/src/com/android/launcher3/model/BgDataModel.java +++ b/src/com/android/launcher3/model/BgDataModel.java @@ -118,9 +118,9 @@ public class BgDataModel { deepShortcutMap.clear(); } - public synchronized void dump(String prefix, FileDescriptor fd, PrintWriter writer, - String[] args) { - if (args.length > 0 && TextUtils.equals(args[0], "--proto")) { + public synchronized void dump(String prefix, FileDescriptor fd, PrintWriter writer, + String[] args) { + 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))); }