commit 46e9289ceecabb3ec5ad95e4b9fdb8a067a9d7d2
author Hyunyoung Song <hyunyoungs@google.com> Wed Apr 08 08:48:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 08 08:48:18 2020 +0000
tree 53c7a01730af4a359891745a6f75805cf9d77eda
parent d3ba747e6da8516f2ee991154c2fc0f735c51581
parent f24c614ad248d3ae13f2cb502067adb8752de693

Fix NPE inside ItemInfo am: f24c614ad2

Change-Id: I0ad945877aa0d3c894a8c175f105ad4d1e6d0e81

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