From 03596d9d21d4c1287966cdc4f950e44cd2869113 Mon Sep 17 00:00:00 2001 From: Alexander Martinz Date: Wed, 4 Jul 2018 18:43:04 +0200 Subject: logging: prevent NPE at logDeepShortcutsOpen getLaunchProviderRecursive(View) can return null. Check if provider is null before using it. Change-Id: I8cd157ba315e1dcc1fed428e0474b55b774bbd2f Signed-off-by: Alexander Martinz --- src/com/android/launcher3/logging/UserEventDispatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index d5c6515c0..21fce97a5 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -246,7 +246,7 @@ public class UserEventDispatcher { public void logDeepShortcutsOpen(View icon) { LogContainerProvider provider = getLaunchProviderRecursive(icon); - if (icon == null || !(icon.getTag() instanceof ItemInfo)) { + if (icon == null || !(icon.getTag() instanceof ItemInfo) || provider == null) { return; } ItemInfo info = (ItemInfo) icon.getTag(); -- cgit v1.2.3