diff options
| author | Alexander Martinz <amartinz@shiftphones.com> | 2018-07-04 18:43:04 +0200 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-11-01 22:01:44 -0600 |
| commit | 8d75b44cd7c86884415fdba6d2d62dee0d1a78ac (patch) | |
| tree | 93ed5451d4d212536bd6e8c51d7cea1996efa4ef /src/com/android/launcher3 | |
| parent | 0c5fee1846007a9e470046f8a46598603b48fd8b (diff) | |
| download | android_packages_apps_Trebuchet-8d75b44cd7c86884415fdba6d2d62dee0d1a78ac.tar.gz android_packages_apps_Trebuchet-8d75b44cd7c86884415fdba6d2d62dee0d1a78ac.tar.bz2 android_packages_apps_Trebuchet-8d75b44cd7c86884415fdba6d2d62dee0d1a78ac.zip | |
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 <amartinz@shiftphones.com>
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/logging/UserEventDispatcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java index d1e1051ee..2295cd9bd 100644 --- a/src/com/android/launcher3/logging/UserEventDispatcher.java +++ b/src/com/android/launcher3/logging/UserEventDispatcher.java @@ -367,7 +367,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(); |