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

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

Merge "getPinnedShortcuts() shouldn't crash with shortcuts with..."

parents c848d896 40dc2114

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

+2 −1
Original line number Diff line number Diff line
@@ -674,7 +674,8 @@ class ShortcutPackage extends ShortcutPackageItem { 
            }

            checked.add(activity);



            if (!s.injectIsActivityEnabledAndExported(activity, getOwnerUserId())) {

            if ((activity != null)

                    && !s.injectIsActivityEnabledAndExported(activity, getOwnerUserId())) {

                return false;

            }

        }