commit 44775ad75618b3ff133220caba2a54d7957fb9a1
author Pinyao Ting <pinyaoting@google.com> Wed May 13 11:39:24 2020 -0700
committer Pinyao Ting <pinyaoting@google.com> Wed May 13 11:39:24 2020 -0700
tree 8359d3339cb6f156bdd133294aa1e33041663174
parent 794ca4dba5765db17822b6ec1189f9a1b12590ce

add null check to prevent NPE in logging app launch

Bug: 156458241
Test: manual
Change-Id: I7327453233a1e22473967e7c0513b4e1fa282459

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

diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index da081a0..7818ff5 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -145,7 +145,9 @@
         LauncherEvent event = newLauncherEvent(action,  targets);
         ItemInfo info = v == null ? null : (ItemInfo) v.getTag();
         if (info != null && Utilities.IS_DEBUG_DEVICE && FeatureFlags.ENABLE_HYBRID_HOTSEAT.get()) {
-            FileLog.d(TAG, "appLaunch: packageName:" + info.getTargetComponent().getPackageName()
+            final String pkg = info.getTargetComponent() != null
+                    ? info.getTargetComponent().getPackageName() : "unknown";
+            FileLog.d(TAG, "appLaunch: packageName:" + pkg
                     + ",isWorkApp:" + (info.user != null && !Process.myUserHandle().equals(
                     userHandle)) + ",launchLocation:" + info.container);
         }