diff options
| author | 2022-12-02 10:54:27 -0800 | |
|---|---|---|
| committer | 2022-12-02 15:49:53 -0800 | |
| commit | d273b387e953ba02f79d48e92ef8e8c8e064703b (patch) | |
| tree | a40d6e004f1ba7ae32c959806a1eb58b0ff4f4b4 /java/src | |
| parent | d293b3b3102ef5e3944422fd6bc2cbe7109edf36 (diff) | |
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
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
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()); |