From e066a12a4a4cadabfba8da1af340908c4fdf02f4 Mon Sep 17 00:00:00 2001 From: Andrey Epin Date: Mon, 18 Mar 2024 16:29:47 -0700 Subject: Reload app targets when alternate intents are updated Bug: 302691505 Test: manuate testing with the ShareTest app Change-Id: I061d9d73832f8778e47f2024ee3f25e2dae0c69e --- java/src/com/android/intentresolver/v2/ChooserActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'java/src') 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 oldAltIntents = oldChooserRequest.getAdditionalTargets(); + List 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() { -- cgit v1.2.3-59-g8ed1b