diff options
| author | 2023-03-01 22:22:00 +0000 | |
|---|---|---|
| committer | 2023-03-01 22:22:00 +0000 | |
| commit | 2da728124e1a3eb66c61b95a3b4d1d3ef65e88c3 (patch) | |
| tree | a6389e566638980b899aea4b7588d6db028ff428 /java/src | |
| parent | 87355875ea4fd6b49348a7981cfe1520b715d5b2 (diff) | |
| parent | 22c3a92cb1c313a50c8e339bffa3e3ea8baea4dc (diff) | |
Merge "Fix alternate intents in the intent refinement call." into tm-qpr-dev am: 37364423c1 am: 447f189505 am: 3b172fa260 am: 22c3a92cb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21552780
Change-Id: I6f468cf297d58f44df62bb605ecb12175b1c55ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/ChooserRefinementManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/intentresolver/ChooserRefinementManager.java b/java/src/com/android/intentresolver/ChooserRefinementManager.java index 98c6bddc..5b5c1d32 100644 --- a/java/src/com/android/intentresolver/ChooserRefinementManager.java +++ b/java/src/com/android/intentresolver/ChooserRefinementManager.java @@ -121,10 +121,13 @@ public final class ChooserRefinementManager { final Intent fillIn = new Intent(); final List<Intent> sourceIntents = originalTarget.getAllSourceIntents(); fillIn.putExtra(Intent.EXTRA_INTENT, sourceIntents.get(0)); - if (sourceIntents.size() > 1) { + final int sourceIntentCount = sourceIntents.size(); + if (sourceIntentCount > 1) { fillIn.putExtra( Intent.EXTRA_ALTERNATE_INTENTS, - sourceIntents.subList(1, sourceIntents.size()).toArray()); + sourceIntents + .subList(1, sourceIntentCount) + .toArray(new Intent[sourceIntentCount - 1])); } fillIn.putExtra(Intent.EXTRA_RESULT_RECEIVER, resultReceiver.copyForSending()); return fillIn; |