| commit | fb370205d3a82834046618b5776334bb28b90776 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Tue Sep 26 23:25:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 26 23:25:03 2023 +0000 |
| tree | c4fe9088047c776baee6519840a8cd490cf8ee23 | |
| parent | 75495d90aeb5d1b97d31b1be443f01ed06b450b2 [diff] | |
| parent | ab7d63a77e5d01e2850f5fa87ad971cd04d022af [diff] |
Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev am: 110f1d8b26 am: ab7d63a77e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23623415 Change-Id: I038eed8f7c0cc4d6cf5222fa130b81756902e0d5 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);