commit 45b9fd280a6b74dd96c4d1d3cf635a47e1215eae
author Sunny Goyal <sunnygoyal@google.com> Wed Aug 31 20:39:53 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 31 20:39:53 2016 +0000
tree 866f7525ea4b1fdf37c3e5e1f45fe6ef3beaed66
parent c8b997a21ca1fb7c951cfb1cbb22477f874b6f03
parent b5bf3e6ceeb6f8af433357324a543914fd8ebaf9

Merge "Adding isDemoUser method in userManager" into ub-launcher3-calgary-polish

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;
     }