commit 203f5968812ed1ea3ddd066130eba57d77a9700b
author Sunny Goyal <sunnygoyal@google.com> Tue Jan 19 12:33:05 2021 -0800
committer Sunny Goyal <sunnygoyal@google.com> Tue Jan 19 21:11:14 2021 +0000
tree 35e0d1a6bc51edeb9b9f8e7abc6d9f3e7eb3635d
parent 6638b566670426ba647b155c0f3df06a21d1b1e0

Fixing unrelated icons getting removed during sesison failure

Bug: 177642572
Test: Verified on device
Change-Id: Ia17f7f151b503f95c643c690f2fc11d624911f3e

src/com/android/launcher3/model/AllAppsList.java

diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index c57c3e4..d4fa278 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -26,7 +26,6 @@
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
 import android.os.LocaleList;
-import android.os.Process;
 import android.os.UserHandle;
 import android.util.Log;
 
@@ -162,7 +161,7 @@
     /** Updates the given PackageInstallInfo's associated AppInfo's installation info. */
     public List<AppInfo> updatePromiseInstallInfo(PackageInstallInfo installInfo) {
         List<AppInfo> updatedAppInfos = new ArrayList<>();
-        UserHandle user = Process.myUserHandle();
+        UserHandle user = installInfo.user;
         for (int i = data.size() - 1; i >= 0; i--) {
             final AppInfo appInfo = data.get(i);
             final ComponentName tgtComp = appInfo.getTargetComponent();
@@ -177,7 +176,8 @@
                     appInfo.setProgressLevel(installInfo);
 
                     updatedAppInfos.add(appInfo);
-                } else if (installInfo.state == PackageInstallInfo.STATUS_FAILED) {
+                } else if (installInfo.state == PackageInstallInfo.STATUS_FAILED
+                        && !appInfo.isAppStartable()) {
                     removeApp(i);
                 }
             }