From d273b387e953ba02f79d48e92ef8e8c8e064703b Mon Sep 17 00:00:00 2001 From: Andrey Epin Date: Fri, 2 Dec 2022 10:54:27 -0800 Subject: Fix ChooserActivity crash when launched with a caller-provided target Fix java.lang.UnsupportedOperationException at ShortcutSelectionLogic.addServiceResults() when trying to sort an unmodifiable collection. A new unit test for launcing ChooserActivity with a caller-provided target is added. Fix: 261215405 Test: manual test Test: atest IntentResolverUnitTests Change-Id: I8a28e074044e932753ab4906409cded67f4ccdad --- java/src/com/android/intentresolver/ChooserActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/src') diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java index fe1df879..ebf0d203 100644 --- a/java/src/com/android/intentresolver/ChooserActivity.java +++ b/java/src/com/android/intentresolver/ChooserActivity.java @@ -1160,7 +1160,7 @@ public class ChooserActivity extends ResolverActivity implements if (mChooserRequest.getCallerChooserTargets().size() > 0) { mChooserMultiProfilePagerAdapter.getActiveListAdapter().addServiceResults( /* origTarget */ null, - mChooserRequest.getCallerChooserTargets(), + new ArrayList<>(mChooserRequest.getCallerChooserTargets()), TARGET_TYPE_DEFAULT, /* directShareShortcutInfoCache */ Collections.emptyMap(), /* directShareAppTargetCache */ Collections.emptyMap()); -- cgit v1.2.3-59-g8ed1b