commit 7ccd2daa6216d3938b0a030a4e2d636552635fef
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 21 02:07:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 21 02:07:12 2020 +0000
tree fd570c6ddf5d6eb2e549a42cbee64d7335359540
parent 0f6ecb675edc57037346ae46fa81dc9c5275f6e2
parent 103e8e36aaa6d6279f6d7b217252a392046ea0bd

Merge "ItemInfo null check inside BaseDraggingActivity" into ub-launcher3-rvc-dev

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