commit aba5262022fef5fa7a0c1fd3b0b2468a3e9998d0
author Hyunyoung Song <hyunyoungs@google.com> Wed Aug 31 18:57:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 31 18:57:38 2016 +0000
tree eebbbcd1431dd4b59ad5c1b4ad5bf7bebc0f6781
parent 478730453cf610467072865cdd35a408931deec1
parent d3bf9803f51efa88d966f60b890a5f8193c75d43

ComponentName null check MUST proceed before creating ComponentKey.
am: d3bf9803f5

Change-Id: If723a18616d444ea51ca054f226318bfdcce4429

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e1c64a7..c919db8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4171,6 +4171,10 @@
             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;
     }