commit 12f56b8ab928c66b10f7e24672c66bf5c5fb7dae
author Sunny Goyal <sunnygoyal@google.com> Wed Aug 31 20:47:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 31 20:47:46 2016 +0000
tree 866f7525ea4b1fdf37c3e5e1f45fe6ef3beaed66
parent cbb55d038a2f933ad4fc6cb89662f926b0d800a5
parent b5bf3e6ceeb6f8af433357324a543914fd8ebaf9

Adding isDemoUser method in userManager
am: b5bf3e6cee

Change-Id: Id59e1b1a543b96f17253133acf0cd42ea9be17f2

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