From d3bf9803f51efa88d966f60b890a5f8193c75d43 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Mon, 29 Aug 2016 14:43:53 -0700
Subject: ComponentName null check MUST proceed before creating ComponentKey.

Change-Id: I2460561b62d77d3f2f17dc2a7db765785b46a8c6
---
 src/com/android/launcher3/Launcher.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/com/android')

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f125287bb..340c670b1 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4170,6 +4170,10 @@ public class Launcher extends Activity
             return Collections.EMPTY_LIST;
         }
         ComponentName component = info.getTargetComponent();
+        if (component == null) {
+            return Collections.EMPTY_LIST;
+        }
+
         List<String> ids = mDeepShortcutMap.get(new ComponentKey(component, info.user));
         return ids == null ? Collections.EMPTY_LIST : ids;
     }
-- 
cgit v1.2.3