diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/ShortcutPackage.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index 6f70f4c89ad2..a0fd43640e61 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 @@ class ShortcutPackage extends ShortcutPackageItem { } checked.add(activity); - if (!s.injectIsActivityEnabledAndExported(activity, getOwnerUserId())) { + if ((activity != null) + && !s.injectIsActivityEnabledAndExported(activity, getOwnerUserId())) { return false; } } |