PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hyunyoung Song
2017-11-17 00:37:34 +00:00
committed by Android (Google) Code Review
parent 1dc8a1f3ca 8fe56a6a7d
commit a3921c7ba8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/model/BgDataModel.java
+4 -4
View File
@@ -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)));
}