commit 7cfab69b1c55fb3151db0e1da5a933c755731ca9
author Jon Miranda <jonmiranda@google.com> Tue Sep 17 21:52:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 17 21:52:57 2019 -0700
tree 52778d08b4a0c004e7fa4499e5872f6bf8597b49
parent c708384087fbddcb57f4e21bd8e9220afe87def2
parent 6ed680258e13553623526ec956f5d81b79b4cbd9

Fix BindWidgetTests.
am: 6ed680258e

Change-Id: Ifca5fc650f88bd18985f264ccf4d0c33698faf52

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

diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index c9daced..521b27b 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -555,7 +555,8 @@
                                 }
 
                                 if (c.restoreFlag != 0 && !TextUtils.isEmpty(targetPkg)) {
-                                    SessionInfo si = installingPkgs.get(targetPkg);
+                                    tempPackageKey.update(targetPkg, c.user);
+                                    SessionInfo si = installingPkgs.get(tempPackageKey);
                                     if (si == null) {
                                         info.status &= ~WorkspaceItemInfo.FLAG_INSTALL_SESSION_ACTIVE;
                                     } else {
@@ -656,8 +657,10 @@
                                     appWidgetInfo = new LauncherAppWidgetInfo(appWidgetId,
                                             component);
                                     appWidgetInfo.restoreStatus = c.restoreFlag;
+
+                                    tempPackageKey.update(component.getPackageName(), c.user);
                                     SessionInfo si =
-                                            installingPkgs.get(component.getPackageName());
+                                            installingPkgs.get(tempPackageKey);
                                     Integer installProgress = si == null
                                             ? null
                                             : (int) (si.getProgress() * 100);