From bb993c484ae647b3fdd625badddf2f7183eba616 Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Fri, 26 Feb 2021 12:56:25 -0800 Subject: [PATCH] Adds dump method to ModelDelegate. This allows delegates to include additional data in log dumps. Bug: 181351828 Test: Checked that data was found in a bug report and adb shell dumpsys activity com.google.android.apps.nexuslauncher Change-Id: I7a63430202ff899ac885a544c558e1248d2ce829 --- src/com/android/launcher3/LauncherModel.java | 2 ++ src/com/android/launcher3/model/ModelDelegate.java | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index e89b9b060a..699495c7f2 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -615,7 +615,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi + "\" bitmapIcon=" + info.bitmap.icon + " componentName=" + info.componentName.getPackageName()); } + writer.println(); } + mModelDelegate.dump(prefix, fd, writer, args); mBgDataModel.dump(prefix, fd, writer, args); } diff --git a/src/com/android/launcher3/model/ModelDelegate.java b/src/com/android/launcher3/model/ModelDelegate.java index 92bea5b14c..13ec1ecefb 100644 --- a/src/com/android/launcher3/model/ModelDelegate.java +++ b/src/com/android/launcher3/model/ModelDelegate.java @@ -27,6 +27,8 @@ import com.android.launcher3.R; import com.android.launcher3.shortcuts.ShortcutKey; import com.android.launcher3.util.ResourceBasedOverride; +import java.io.FileDescriptor; +import java.io.PrintWriter; import java.util.Map; /** @@ -89,4 +91,11 @@ public class ModelDelegate implements ResourceBasedOverride { @WorkerThread public void destroy() { } + /** + * Add data to a dumpsys request for Launcher (e.g. for bug reports). + * + * @see com.android.launcher3.Launcher#dump(java.lang.String, java.io.FileDescriptor, + * java.io.PrintWriter, java.lang.String[]) + **/ + public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) { } }