diff options
-rw-r--r-- | java/src/com/android/intentresolver/ui/ShareResultSender.kt | 8 | ||||
-rw-r--r-- | tests/unit/src/com/android/intentresolver/ui/ShareResultSenderImplTest.kt | 22 |
2 files changed, 2 insertions, 28 deletions
diff --git a/java/src/com/android/intentresolver/ui/ShareResultSender.kt b/java/src/com/android/intentresolver/ui/ShareResultSender.kt index dce477ec..2684b817 100644 --- a/java/src/com/android/intentresolver/ui/ShareResultSender.kt +++ b/java/src/com/android/intentresolver/ui/ShareResultSender.kt @@ -30,7 +30,6 @@ import android.service.chooser.ChooserResult.CHOOSER_RESULT_UNKNOWN import android.service.chooser.ChooserResult.ResultType import android.util.Log import com.android.intentresolver.inject.Background -import com.android.intentresolver.inject.ChooserServiceFlags import com.android.intentresolver.inject.Main import com.android.intentresolver.ui.model.ShareAction import dagger.assisted.Assisted @@ -64,7 +63,6 @@ fun interface IntentSenderDispatcher { } class ShareResultSenderImpl( - private val flags: ChooserServiceFlags, @Main private val scope: CoroutineScope, @Background val backgroundDispatcher: CoroutineDispatcher, private val callerUid: Int, @@ -74,13 +72,11 @@ class ShareResultSenderImpl( @AssistedInject constructor( @ActivityContext context: Context, - flags: ChooserServiceFlags, @Main scope: CoroutineScope, @Background backgroundDispatcher: CoroutineDispatcher, @Assisted callerUid: Int, @Assisted chosenComponentSender: IntentSender, ) : this( - flags, scope, backgroundDispatcher, callerUid, @@ -103,7 +99,7 @@ class ShareResultSenderImpl( override fun onActionSelected(action: ShareAction) { Log.i(TAG, "onActionSelected: $action") scope.launch { - if (flags.enableChooserResult() && chooserResultSupported(callerUid)) { + if (chooserResultSupported(callerUid)) { @ResultType val chosenAction = shareActionToChooserResult(action) val intent: Intent = createSelectedActionIntent(chosenAction) intentDispatcher.dispatchIntent(resultSender, intent) @@ -118,7 +114,7 @@ class ShareResultSenderImpl( direct: Boolean, crossProfile: Boolean, ): Intent? { - if (flags.enableChooserResult() && chooserResultSupported(callerUid)) { + if (chooserResultSupported(callerUid)) { if (crossProfile) { Log.i(TAG, "Redacting package from cross-profile ${Intent.EXTRA_CHOOSER_RESULT}") return Intent() diff --git a/tests/unit/src/com/android/intentresolver/ui/ShareResultSenderImplTest.kt b/tests/unit/src/com/android/intentresolver/ui/ShareResultSenderImplTest.kt index 7b43360a..d8b1b175 100644 --- a/tests/unit/src/com/android/intentresolver/ui/ShareResultSenderImplTest.kt +++ b/tests/unit/src/com/android/intentresolver/ui/ShareResultSenderImplTest.kt @@ -22,9 +22,7 @@ import android.content.ComponentName import android.content.Intent import android.os.Process import android.service.chooser.ChooserResult -import android.service.chooser.Flags import androidx.test.platform.app.InstrumentationRegistry -import com.android.intentresolver.inject.FakeChooserServiceFlags import com.android.intentresolver.ui.model.ShareAction import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage @@ -46,8 +44,6 @@ class ShareResultSenderImplTest { @get:Rule val compatChangeRule: TestRule = PlatformCompatChangeRule() - val flags = FakeChooserServiceFlags() - @OptIn(ExperimentalCoroutinesApi::class) @EnableCompatChanges(ChooserResult.SEND_CHOOSER_RESULT) @Test @@ -56,11 +52,8 @@ class ShareResultSenderImplTest { val deferred = CompletableDeferred<Intent>() val intentDispatcher = IntentSenderDispatcher { _, intent -> deferred.complete(intent) } - flags.setFlag(Flags.FLAG_ENABLE_CHOOSER_RESULT, true) - val resultSender = ShareResultSenderImpl( - flags = flags, scope = this, backgroundDispatcher = UnconfinedTestDispatcher(testScheduler), callerUid = Process.myUid(), @@ -91,11 +84,8 @@ class ShareResultSenderImplTest { val deferred = CompletableDeferred<Intent>() val intentDispatcher = IntentSenderDispatcher { _, intent -> deferred.complete(intent) } - flags.setFlag(Flags.FLAG_ENABLE_CHOOSER_RESULT, true) - val resultSender = ShareResultSenderImpl( - flags = flags, scope = this, backgroundDispatcher = UnconfinedTestDispatcher(testScheduler), callerUid = Process.myUid(), @@ -127,11 +117,8 @@ class ShareResultSenderImplTest { val deferred = CompletableDeferred<Intent>() val intentDispatcher = IntentSenderDispatcher { _, intent -> deferred.complete(intent) } - flags.setFlag(Flags.FLAG_ENABLE_CHOOSER_RESULT, true) - val resultSender = ShareResultSenderImpl( - flags = flags, scope = this, backgroundDispatcher = UnconfinedTestDispatcher(testScheduler), callerUid = Process.myUid(), @@ -165,11 +152,8 @@ class ShareResultSenderImplTest { val deferred = CompletableDeferred<Intent>() val intentDispatcher = IntentSenderDispatcher { _, intent -> deferred.complete(intent) } - flags.setFlag(Flags.FLAG_ENABLE_CHOOSER_RESULT, true) - val resultSender = ShareResultSenderImpl( - flags = flags, scope = this, backgroundDispatcher = UnconfinedTestDispatcher(testScheduler), callerUid = Process.myUid(), @@ -192,11 +176,8 @@ class ShareResultSenderImplTest { val deferred = CompletableDeferred<Intent>() val intentDispatcher = IntentSenderDispatcher { _, intent -> deferred.complete(intent) } - flags.setFlag(Flags.FLAG_ENABLE_CHOOSER_RESULT, true) - val resultSender = ShareResultSenderImpl( - flags = flags, scope = this, backgroundDispatcher = UnconfinedTestDispatcher(testScheduler), callerUid = Process.myUid(), @@ -233,11 +214,8 @@ class ShareResultSenderImplTest { val deferred = CompletableDeferred<Intent>() val intentDispatcher = IntentSenderDispatcher { _, intent -> deferred.complete(intent) } - flags.setFlag(Flags.FLAG_ENABLE_CHOOSER_RESULT, true) - val resultSender = ShareResultSenderImpl( - flags = flags, scope = this, backgroundDispatcher = UnconfinedTestDispatcher(testScheduler), callerUid = Process.myUid(), |