commit 03a222ee866a64ed8da855f0a06c5549dcc18a26
author Hyunyoung Song <hyunyoungs@google.com> Tue Apr 25 23:59:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 23:59:24 2017 +0000
tree 623d740135cb2fbb912c21f88ac12ada00d06dba
parent 7b42cb7848b8eff83bb59c660974cb624af718f6
parent 2a120d448e74598e49f561ca296ca98095fe5308

Merge "make sure all type of Item in DumpTarget contains component and package name b/36904684" into ub-launcher3-dorval
am: 2a120d448e

Change-Id: I55c5f8dc728962f8b37a00892d871eeddf038632

src/com/android/launcher3/logging/DumpTargetWrapper.java

diff --git a/src/com/android/launcher3/logging/DumpTargetWrapper.java b/src/com/android/launcher3/logging/DumpTargetWrapper.java
index 2646a22..365e8f2 100644
--- a/src/com/android/launcher3/logging/DumpTargetWrapper.java
+++ b/src/com/android/launcher3/logging/DumpTargetWrapper.java
@@ -19,6 +19,7 @@
 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 @@
         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 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;