commit 842638b2c303655470c35b98dbae566dea57c803
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 21 02:20:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 02:20:09 2020 +0000
tree ad96fc68e27f1eea41085662a9da616e812a16b6
parent 256f85da78b2ffe2ea75f8be56fa8d208254245c
parent 7ccd2daa6216d3938b0a030a4e2d636552635fef

Merge "ItemInfo null check inside BaseDraggingActivity" into ub-launcher3-rvc-dev am: 7ccd2daa62

Change-Id: Iae25092498100f36634c900f1182a538112d8ba2

src/com/android/launcher3/BaseDraggingActivity.java

diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index f69c8ed..e4f201c 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -181,7 +181,9 @@
                         sourceContainer);
             }
             getUserEventDispatcher().logAppLaunch(v, intent, user);
-            getStatsLogManager().log(APP_LAUNCH_TAP, item.buildProto(null, null));
+
+            getStatsLogManager().log(APP_LAUNCH_TAP, item == null ? null
+                    : item.buildProto(null, null));
             return true;
         } catch (NullPointerException|ActivityNotFoundException|SecurityException e) {
             Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();