summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-03-21 18:47:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-03-21 18:47:24 +0000
commit58180c775c2c2a38903e489ce064250e2155c875 (patch)
tree8b383fb1c066e9a3a2541240195bf57699357e3f /java/src
parent48a676de11407883af5d0ce2d90587819d89ce08 (diff)
parente066a12a4a4cadabfba8da1af340908c4fdf02f4 (diff)
Merge "Reload app targets when alternate intents are updated" into main
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/v2/ChooserActivity.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/intentresolver/v2/ChooserActivity.java b/java/src/com/android/intentresolver/v2/ChooserActivity.java
index 110983d0..b164bd9f 100644
--- a/java/src/com/android/intentresolver/v2/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/v2/ChooserActivity.java
@@ -683,11 +683,12 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
ChooserRequest oldChooserRequest, ChooserRequest newChooserRequest) {
Intent oldTargetIntent = oldChooserRequest.getTargetIntent();
Intent newTargetIntent = newChooserRequest.getTargetIntent();
+ List<Intent> oldAltIntents = oldChooserRequest.getAdditionalTargets();
+ List<Intent> newAltIntents = newChooserRequest.getAdditionalTargets();
// TODO: a workaround for the unnecessary target reloading caused by multiple flow updates -
// an artifact of the current implementation; revisit.
- // reference comparison is intentional
- return oldTargetIntent != newTargetIntent;
+ return !oldTargetIntent.equals(newTargetIntent) || !oldAltIntents.equals(newAltIntents);
}
private void recreatePagerAdapter() {