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

Commit 0fa85ae5 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 sc-dev am: 110f1d8b am: ab7d63a7 am: fb370205 am: ebab9abb am: 74d48a21 am: 229d5594 am: bdfde51c am: 3bbb8d1d

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



Change-Id: I04c42b02e1e62cfcb761779f31885c5108c39acd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f42f3e3 3bbb8d1d

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

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

        s.saveIconAndFixUpShortcutLocked(this, newShortcut);

        s.fixUpShortcutResourceNamesAndValues(newShortcut);

        ensureShortcutCountBeforePush();

        saveShortcut(newShortcut);

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

        Preconditions.checkArgument(newShortcut.isEnabled(),

                "pushDynamicShortcuts() cannot publish disabled shortcuts");

        ensureShortcutCountBeforePush();



        newShortcut.addFlags(ShortcutInfo.FLAG_DYNAMIC);