2 files changed, 18 insertions, 6 deletions
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 250edaf2..f7cc9291 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -25,6 +25,7 @@ import static androidx.lifecycle.LifecycleKt.getCoroutineScope;
 import static com.android.intentresolver.ChooserActionFactory.EDIT_SOURCE;
 import static com.android.intentresolver.Flags.fixShortcutsFlashing;
 import static com.android.intentresolver.Flags.keyboardNavigationFix;
+import static com.android.intentresolver.Flags.rebuildAdaptersOnTargetPinning;
 import static com.android.intentresolver.Flags.shareouselUpdateExcludeComponentsExtra;
 import static com.android.intentresolver.Flags.unselectFinalItem;
 import static com.android.intentresolver.ext.CreationExtrasExtKt.replaceDefaultArgs;
@@ -1545,10 +1546,14 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
     private void handlePackagesChanged(@Nullable ResolverListAdapter listAdapter) {
         // Refresh pinned items
         mPinnedSharedPrefs = getPinnedSharedPrefs(this);
-        if (listAdapter == null) {
-            mChooserMultiProfilePagerAdapter.refreshPackagesInAllTabs();
+        if (rebuildAdaptersOnTargetPinning()) {
+            recreatePagerAdapter();
         } else {
-            listAdapter.handlePackagesChanged();
+            if (listAdapter == null) {
+                mChooserMultiProfilePagerAdapter.refreshPackagesInAllTabs();
+            } else {
+                listAdapter.handlePackagesChanged();
+            }
         }
     }
 
diff --git a/java/src/com/android/intentresolver/ShortcutSelectionLogic.java b/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
index 2d5ec451..3a1a51e3 100644
--- a/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
+++ b/java/src/com/android/intentresolver/ShortcutSelectionLogic.java
@@ -16,6 +16,8 @@
 
 package com.android.intentresolver;
 
+import static com.android.intentresolver.Flags.rebuildAdaptersOnTargetPinning;
+
 import android.app.prediction.AppTarget;
 import android.content.Context;
 import android.content.Intent;
@@ -171,16 +173,21 @@ public class ShortcutSelectionLogic {
             List<TargetInfo> serviceTargets) {
 
         // Check for duplicates and abort if found
-        for (TargetInfo otherTargetInfo : serviceTargets) {
+        for (int i = 0; i < serviceTargets.size(); i++) {
+            TargetInfo otherTargetInfo = serviceTargets.get(i);
             if (chooserTargetInfo.isSimilar(otherTargetInfo)) {
+                if (rebuildAdaptersOnTargetPinning()
+                        && chooserTargetInfo.isPinned() != otherTargetInfo.isPinned()) {
+                    serviceTargets.set(i, chooserTargetInfo);
+                    return true;
+                }
                 return false;
             }
         }
 
         int currentSize = serviceTargets.size();
         final float newScore = chooserTargetInfo.getModifiedScore();
-        for (int i = 0; i < Math.min(currentSize, maxRankedTargets);
-                i++) {
+        for (int i = 0; i < Math.min(currentSize, maxRankedTargets); i++) {
             final TargetInfo serviceTarget = serviceTargets.get(i);
             if (serviceTarget == null) {
                 serviceTargets.set(i, chooserTargetInfo);