diff options
| author | Pinyao Ting <pinyaoting@google.com> | 2023-06-08 14:38:19 -0700 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-11 22:47:43 +0000 |
| commit | ae768fbb9975fdab267f525831cb52f485ab0ecc (patch) | |
| tree | 1d9eaedf062b22aa9c8ce87f31c47bb7b5e97e97 | |
| parent | 1120bc7e511710b1b774adf29ba47106292365e7 (diff) | |
| download | base-ae768fbb9975fdab267f525831cb52f485ab0ecc.tar.gz | |
Restrict number of shortcuts can be added through addDynamicShortcuts
This CL fixes the issue where, when an app have multiple main
activities, the total number of shortcuts can grow indefinitely if they
were published through addDynamicShortcuts.
Bug: 281061287
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3215e73e36aa0463429226b5743ce24badf31227)
Merged-In: Ib3eecefee34517b670c59dd5b8526fe9eb24f463
Change-Id: Ib3eecefee34517b670c59dd5b8526fe9eb24f463
| -rw-r--r-- | services/core/java/com/android/server/pm/ShortcutPackage.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index 8507ad028a19..1b7687e6fc16 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -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); |