Merge "Fix alternate intents in the intent refinement call." into tm-qpr-dev am: 37364423c1 am: 447f189505

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21552780

Change-Id: I1153f3dacc244f34a1bd9131065aa2852531d3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;