From 103e8e36aaa6d6279f6d7b217252a392046ea0bd Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Mon, 20 Apr 2020 16:29:04 -0700 Subject: [PATCH] ItemInfo null check inside BaseDraggingActivity Bug: 153611516 Change-Id: I0b9fed9134a103e3f7162756fd91ea4ad89e09bb --- src/com/android/launcher3/BaseDraggingActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index 2dc783672d..cb353aed16 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -184,7 +184,9 @@ public abstract class BaseDraggingActivity extends BaseActivity 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();