From 9b129854b513c72d10ea81f83788b363adc15680 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Mon, 29 Mar 2021 12:41:44 -0700
Subject: [PATCH] Refrain from creating app-search schema unnecessarily.

Calling removeShortcuts() resulted in creating an app-search schema
for every package, even the ones without shortcuts. This behavior is
causing an extra delay when launcher starts.

Bug: 183614316, 183684181
Test: manual
Test: atest ShortcutManagerTest1 ShortcutManagerTest2 |
      ShortcutManagerTest3 ShortcutManagerTest4 ShortcutManagerTest5 |
      ShortcutManagerTest6 ShortcutManagerTest7 ShortcutManagerTest8 |
      ShortcutManagerTest9 ShortcutManagerTest10 ShortcutManagerTest11
Change-Id: I20aaf0d8b78a92c33d22989c9cc35c53fb9b4127
---
 services/core/java/com/android/server/pm/ShortcutUser.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/pm/ShortcutUser.java b/services/core/java/com/android/server/pm/ShortcutUser.java
index ce49d8894fdbf..5f0aa03cac59a 100644
--- a/services/core/java/com/android/server/pm/ShortcutUser.java
+++ b/services/core/java/com/android/server/pm/ShortcutUser.java
@@ -333,10 +333,7 @@ class ShortcutUser {
 
         if (!shortcutPackage.rescanPackageIfNeeded(isNewApp, forceRescan)) {
             if (isNewApp) {
-                final ShortcutPackage sp = mPackages.remove(packageName);
-                if (sp != null) {
-                    sp.removeShortcuts();
-                }
+                mPackages.remove(packageName);
             }
         }
     }