commit 110f1d8b2669f6a7064b876d890bde0cd8914c77
author Pinyao Ting <pinyaoting@google.com> Tue Sep 26 21:39:07 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 26 21:39:07 2023 +0000
tree 35c7f00c60214fefd857234a044304e38be18802
parent b25ee8669f40e7d30dd176699651fd1f7ca0e700
parent 3215e73e36aa0463429226b5743ce24badf31227

Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into sc-dev

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

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);