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

Commit 6bf60943 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

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

am: c63c9f8a

Change-Id: Ib006982c87cc4378c697e213504adc05cf2c0658
parents fdde7e4a c63c9f8a

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;

            }

        }