commit 521e3748d8955850b4bf7a8832f3129c46ba5374
author Federico Baron <fbaron@google.com> Tue Feb 14 19:28:19 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 19:28:19 2023 +0000
tree f5947fa01796f57523535f5df25aea510ee5e05d
parent 673e6437b826382dabcf69dc9c47c93bb2821b17
parent ecb053259785827daa50d235a915b17642ffee99

Merge "Fix wrong widget appearing in widget picker for tablet" into tm-qpr-dev

src/com/android/launcher3/popup/PopupDataProvider.java

diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index 69c96ff..44e3dd6 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -242,7 +242,7 @@
     public WidgetsListContentEntry getSelectedAppWidgets(PackageUserKey packageUserKey) {
         return (WidgetsListContentEntry) mAllWidgets.stream()
                 .filter(row -> row instanceof WidgetsListContentEntry
-                        && row.mPkgItem.packageName.equals(packageUserKey.mPackageName))
+                        && PackageUserKey.fromPackageItemInfo(row.mPkgItem).equals(packageUserKey))
                 .findAny()
                 .orElse(null);
     }