commit c63c9f8ae188bbd57e72a0ba3f595600b2139d52
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 18 23:56:55 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 18 23:56:55 2017 +0000
tree f8ed812f59155630d900e77de35c702541d1c9cc
parent 272c482c2ad5ad72c8b053432fdff02281307989
parent c401bac0d7b381c20ebdef9b881fb16dd7a61d84

Merge "DO NOT MERGE getPinnedShortcuts() shouldn't crash with shortcuts with..." into oc-mr1-dev

services/core/java/com/android/server/pm/ShortcutPackage.java

diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
index 6f70f4c..a0fd436 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -611,7 +611,8 @@
             }
             checked.add(activity);
 
-            if (!s.injectIsActivityEnabledAndExported(activity, getOwnerUserId())) {
+            if ((activity != null)
+                    && !s.injectIsActivityEnabledAndExported(activity, getOwnerUserId())) {
                 return false;
             }
         }