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

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

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

2 files changed, 66 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;
diff --git a/java/tests/src/com/android/intentresolver/ChooserRefinementManagerTest.kt b/java/tests/src/com/android/intentresolver/ChooserRefinementManagerTest.kt
new file mode 100644
index 00000000..50c37c7f
--- /dev/null
+++ b/java/tests/src/com/android/intentresolver/ChooserRefinementManagerTest.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver
+
+import android.content.Context
+import android.content.Intent
+import android.content.IntentSender
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.intentresolver.chooser.TargetInfo
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.Mockito
+import java.util.function.Consumer
+import org.junit.Assert.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class ChooserRefinementManagerTest {
+    @Test
+    fun testMaybeHandleSelection() {
+        val intentSender = mock<IntentSender>()
+        val refinementManager = ChooserRefinementManager(
+            mock<Context>(),
+            intentSender,
+            Consumer<TargetInfo>{},
+            Runnable{})
+
+        val intents = listOf(Intent(Intent.ACTION_VIEW), Intent(Intent.ACTION_EDIT))
+        val targetInfo = mock<TargetInfo>{
+            whenever(allSourceIntents).thenReturn(intents)
+        }
+
+        refinementManager.maybeHandleSelection(targetInfo)
+
+        val intentCaptor = ArgumentCaptor.forClass(Intent::class.java)
+        Mockito.verify(intentSender).sendIntent(
+            any(), eq(0), intentCaptor.capture(), eq(null), eq(null))
+
+        val intent = intentCaptor.value
+        assertEquals(intents[0], intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java))
+
+        val alternates =
+            intent.getParcelableArrayExtra(Intent.EXTRA_ALTERNATE_INTENTS, Intent::class.java)
+        assertEquals(1, alternates?.size)
+        assertEquals(intents[1], alternates?.get(0))
+    }
+}