Merge "Remove unnecessary invokation on AppSearch" into sc-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java
index fd8ec7f4bdeb..2dad8ceb4add 100644
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -2187,6 +2187,10 @@ class ShortcutPackage extends ShortcutPackageItem {
 
     private void saveShortcut(@NonNull final Collection<ShortcutInfo> shortcuts) {
         Objects.requireNonNull(shortcuts);
+        if (shortcuts.isEmpty()) {
+            // No need to invoke AppSearch when there's nothing to save.
+            return;
+        }
         ConcurrentUtils.waitForFutureNoInterrupt(
                 runInAppSearch(session -> {
                     final AndroidFuture<Boolean> future = new AndroidFuture<>();