diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2017-04-24 13:01:47 -0700 |
---|---|---|
committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-04-24 13:01:47 -0700 |
commit | 52a77044cf8c42e7a56d487cfa512a28af7d3a75 (patch) | |
tree | 0cf1b892129c70f42eb65650bdb41f67877f431c /src/com/android/launcher3/logging | |
parent | 46b3a135280e6a72b6c178f7a6fd57cb056b1e3b (diff) | |
download | android_packages_apps_Trebuchet-52a77044cf8c42e7a56d487cfa512a28af7d3a75.tar.gz android_packages_apps_Trebuchet-52a77044cf8c42e7a56d487cfa512a28af7d3a75.tar.bz2 android_packages_apps_Trebuchet-52a77044cf8c42e7a56d487cfa512a28af7d3a75.zip |
make sure all type of Item in DumpTarget contains component and package name
b/36904684
Change-Id: I3c71726a376fd1923e193cafe3b5a9b85a48c895
Diffstat (limited to 'src/com/android/launcher3/logging')
-rw-r--r-- | src/com/android/launcher3/logging/DumpTargetWrapper.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/launcher3/logging/DumpTargetWrapper.java b/src/com/android/launcher3/logging/DumpTargetWrapper.java index 2646a2242..365e8f21e 100644 --- a/src/com/android/launcher3/logging/DumpTargetWrapper.java +++ b/src/com/android/launcher3/logging/DumpTargetWrapper.java @@ -19,6 +19,7 @@ import android.os.Process; import android.text.TextUtils; import com.android.launcher3.ItemInfo; +import com.android.launcher3.LauncherAppWidgetInfo; import com.android.launcher3.LauncherSettings; import com.android.launcher3.model.nano.LauncherDumpProto; import com.android.launcher3.model.nano.LauncherDumpProto.ContainerType; @@ -40,11 +41,6 @@ public class DumpTargetWrapper { children = new ArrayList<>(); } - public DumpTargetWrapper(DumpTarget t) { - this(); - node = t; - } - public DumpTargetWrapper(int containerType, int id) { this(); node = newContainerTarget(containerType, id); @@ -138,7 +134,13 @@ public class DumpTargetWrapper { public DumpTarget writeToDumpTarget(ItemInfo info) { node.component = info.getTargetComponent() == null? "": info.getTargetComponent().flattenToString(); - node.packageName = info.getIntent() == null? "": info.getIntent().getPackage(); + node.packageName = info.getTargetComponent() == null? "": + info.getTargetComponent().getPackageName(); + if (info instanceof LauncherAppWidgetInfo) { + node.component = ((LauncherAppWidgetInfo) info).providerName.flattenToString(); + node.packageName = ((LauncherAppWidgetInfo) info).providerName.getPackageName(); + } + node.gridX = info.cellX; node.gridY = info.cellY; node.spanX = info.spanX; |