commit 677ae48c49d54c42e22c4d955707df10f301aa9e
author Hyunyoung Song <hyunyoungs@google.com> Wed Apr 08 09:20:34 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 08 09:20:34 2020 +0000
tree 1c731ec2081580f8356f6ae13296a113dffdf4d1
parent 9c777f649545bad4986217e9185b73faca67ad48
parent 96fb1be0739d825e6199c7c7f29898611755c704

Fix NPE inside ItemInfo am: f24c614ad2 am: 46e9289cee am: 96fb1be073

Change-Id: Ic04d91290c4b1980b1fe01e671dac4c4f2067635

src/com/android/launcher3/ItemInfo.java

diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java
index 8c4e4a0..6f5b941 100644
--- a/src/com/android/launcher3/ItemInfo.java
+++ b/src/com/android/launcher3/ItemInfo.java
@@ -248,6 +248,7 @@
         LauncherAtom.ItemInfo.Builder itemBuilder = LauncherAtom.ItemInfo.newBuilder();
         itemBuilder.setIsWork(user != Process.myUserHandle());
         ComponentName cn = getTargetComponent();
+        if (cn == null) return itemBuilder.build();
         switch (itemType) {
             case ITEM_TYPE_APPLICATION:
                 itemBuilder.setApplication(LauncherAtom.Application.newBuilder()