commit 96fb1be0739d825e6199c7c7f29898611755c704
author Hyunyoung Song <hyunyoungs@google.com> Wed Apr 08 09:04:25 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 08 09:04:25 2020 +0000
tree 53c7a01730af4a359891745a6f75805cf9d77eda
parent d5e144463f24d391c6671c6d7e162b5cb55d0bfd
parent 46e9289ceecabb3ec5ad95e4b9fdb8a067a9d7d2

Fix NPE inside ItemInfo am: f24c614ad2 am: 46e9289cee

Change-Id: Ie17a65e693188a5c8eb86617d9a7bd69b1967d7c

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()