commit 5a93eb3bafbe38bccd34c59c4843c318135f7975
author Samuel Fufa <sfufa@google.com> Fri Feb 21 18:51:36 2020 -0800
committer Samuel Fufa <sfufa@google.com> Fri Feb 21 18:52:30 2020 -0800
tree a89c4b4940bd1655a226f2c39812e80cd083d6ff
parent 9779405023996bbe6bc2f9a050d66f4dbd9d5385

Fix NPE on app launch log

Bug: 149969889
Change-Id: I60fd283ac082fab1ebf6ea90568e054525c414cc

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 199d13f..afa3f6d 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -147,7 +147,7 @@
             fillIntentInfo(event.srcTarget[0], intent, userHandle);
         }
         ItemInfo info = (ItemInfo) v.getTag();
-        if (Utilities.IS_DEBUG_DEVICE && FeatureFlags.ENABLE_HYBRID_HOTSEAT.get()) {
+        if (info != null && Utilities.IS_DEBUG_DEVICE && FeatureFlags.ENABLE_HYBRID_HOTSEAT.get()) {
             FileLog.d(TAG, "appLaunch: packageName:" + info.getTargetComponent().getPackageName()
                     + ",isWorkApp:" + (info.user != null && !Process.myUserHandle().equals(
                     userHandle)) + ",launchLocation:" + info.container);