Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c63c9f8a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 272c482c c401bac0

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

            }

        }