Merge "Remove SelectableTargetInfo#SelectableTargetInfoCommunicator interface" into tm-qpr-dev

2 files changed, 10 insertions, 9 deletions

diff --git a/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt b/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
index c43b014c..bcb6c240 100644
--- a/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
+++ b/java/tests/src/com/android/intentresolver/ChooserListAdapterTest.kt
@@ -28,7 +28,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.android.intentresolver.ChooserListAdapter.LoadDirectShareIconTask
 import com.android.intentresolver.chooser.SelectableTargetInfo
-import com.android.intentresolver.chooser.SelectableTargetInfo.SelectableTargetInfoCommunicator
 import com.android.intentresolver.chooser.TargetInfo
 import com.android.internal.R
 import org.junit.Before
@@ -48,11 +47,8 @@ class ChooserListAdapterTest {
     private val resolverListController = mock<ResolverListController>()
     private val chooserListCommunicator = mock<ChooserListAdapter.ChooserListCommunicator> {
         whenever(maxRankedTargets).thenReturn(0)
+        whenever(targetIntent).thenReturn(mock())
     }
-    private val selectableTargetInfoCommunicator =
-        mock<SelectableTargetInfoCommunicator> {
-            whenever(targetIntent).thenReturn(mock())
-        }
     private val chooserActivityLogger = mock<ChooserActivityLogger>()
 
     private fun createChooserListAdapter(
@@ -65,7 +61,6 @@ class ChooserListAdapterTest {
             false,
             resolverListController,
             chooserListCommunicator,
-            selectableTargetInfoCommunicator,
             packageManager,
             chooserActivityLogger,
         ) {
diff --git a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
index b957bb9d..8c7c28bb 100644
--- a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
@@ -82,9 +82,15 @@ public class ChooserWrapperActivity
         PackageManager packageManager =
                 sOverrides.packageManager == null ? context.getPackageManager()
                         : sOverrides.packageManager;
-        return new ChooserListAdapter(context, payloadIntents, initialIntents, rList,
-                filterLastUsed, resolverListController,
-                this, this, packageManager,
+        return new ChooserListAdapter(
+                context,
+                payloadIntents,
+                initialIntents,
+                rList,
+                filterLastUsed,
+                resolverListController,
+                this,
+                packageManager,
                 getChooserActivityLogger());
     }