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

Commit 87de7ffc authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts"... 

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623109



Change-Id: I2211e60a745e9870688b94dba86fb31e7c6b21ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30316315 0e03b8d4

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

+1 −1
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
        // Extract Icon and update the icon res ID and the bitmap path.

        s.saveIconAndFixUpShortcutLocked(newShortcut);

        s.fixUpShortcutResourceNamesAndValues(newShortcut);

        ensureShortcutCountBeforePush();

        mShortcuts.put(newShortcut.getId(), newShortcut);

    }
@@ -351,7 +352,6 @@ class ShortcutPackage extends ShortcutPackageItem { 
            @NonNull List<ShortcutInfo> changedShortcuts) {

        Preconditions.checkArgument(newShortcut.isEnabled(),

                "pushDynamicShortcuts() cannot publish disabled shortcuts");

        ensureShortcutCountBeforePush();



        newShortcut.addFlags(ShortcutInfo.FLAG_DYNAMIC);