| commit | ab7d63a77e5d01e2850f5fa87ad971cd04d022af | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Tue Sep 26 22:27:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 26 22:27:56 2023 +0000 |
| tree | 2c568edc58c7f7114ec4e55a169d04c28e6601e5 | |
| parent | c1e069ef40dbff7b0c76e1efa0f8ed90f4867659 [diff] | |
| parent | 110f1d8b2669f6a7064b876d890bde0cd8914c77 [diff] |
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b26 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623415 Change-Id: Ie01e2c81fbf8c10e29ee7e504a552dd284e71811 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index e400753..1a71ca8 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -359,6 +359,7 @@ // Extract Icon and update the icon res ID and the bitmap path. s.saveIconAndFixUpShortcutLocked(newShortcut); s.fixUpShortcutResourceNamesAndValues(newShortcut); + ensureShortcutCountBeforePush(); saveShortcut(newShortcut); } @@ -405,7 +406,6 @@ @NonNull List<ShortcutInfo> changedShortcuts) { Preconditions.checkArgument(newShortcut.isEnabled(), "pushDynamicShortcuts() cannot publish disabled shortcuts"); - ensureShortcutCountBeforePush(); newShortcut.addFlags(ShortcutInfo.FLAG_DYNAMIC);