commit 4b64a3493f0e50675d21b712e7314c4838a3c6c9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 13 19:34:18 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 13 19:34:18 2020 +0000
tree dca5fd0f20fb01b7dde45e5218ac428ec33a0d40
parent 1d1c080f0cad89a296599d58f1df0ef7dbf13d2d
parent 2f64428700726284f27f4b87ccf4086502a5e8c1

Merge "add null check to prevent NPE in logging app launch" into ub-launcher3-rvc-dev am: 2f64428700

Change-Id: I09190a7031063c2ef40a7c1c85a5ebcb70661cc0

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);
         }