Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b521669e authored by Matt Pietal's avatar Matt Pietal
Browse files

Add alwaysCollectFlowInBackground and kosmos JavaAdapter 

Adds an option to keep work in the background scope.

And update all the usages that I can for kosmos.

Test: atest SystemUITests
Flag: EXEMPT bugfix
Bug: 405159039
Change-Id: I3eb15603ddb56653bd116823704ca06d5a163c28
parent af19c584

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ import com.android.systemui.statusbar.policy.UserSwitcherController 
import com.android.systemui.testKosmos

import com.android.systemui.user.domain.interactor.SelectedUserInteractor

import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.kotlin.JavaAdapter

import com.android.systemui.util.kotlin.javaAdapter

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.argThat

import com.android.systemui.util.mockito.argumentCaptor
@@ -277,7 +277,7 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
                audioManager,

                faceAuthInteractor,

                mock(),

                { JavaAdapter(kosmos.testScope.backgroundScope) },

                { kosmos.javaAdapter },

                mSelectedUserInteractor,

                deviceProvisionedController,

                faceAuthAccessibilityDelegate,

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/DeviceInactiveConditionTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.systemui.kosmos.runTest 
import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.statusbar.policy.keyguardStateController

import com.android.systemui.testKosmos

import com.android.systemui.util.kotlin.JavaAdapter

import com.android.systemui.util.kotlin.javaAdapter

import com.google.common.truth.Truth.assertThat

import org.junit.Test

import org.junit.runner.RunWith
@@ -61,7 +61,7 @@ class DeviceInactiveConditionTest : SysuiTestCase() { 
                wakefulnessLifecycle,

                keyguardUpdateMonitor,

                keyguardInteractor,

                JavaAdapter(applicationCoroutineScope),

                javaAdapter,

            )

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java

+1 −2
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController; 
import com.android.systemui.statusbar.policy.data.repository.FakeUserSetupRepository;

import com.android.systemui.user.domain.interactor.SelectedUserInteractor;

import com.android.systemui.user.domain.interactor.UserSwitcherInteractor;

import com.android.systemui.util.kotlin.JavaAdapter;

import com.android.systemui.utils.windowmanager.WindowManagerProvider;



import dagger.Lazy;
@@ -269,7 +268,7 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { 
                mShadeRepository,

                mShadeInteractor,

                mKosmos.getActiveNotificationsInteractor(),

                new JavaAdapter(mTestScope.getBackgroundScope()),

                mKosmos.getJavaAdapter(),

                mCastController,

                splitShadeStateController,

                () -> mKosmos.getCommunalTransitionViewModel(),

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/OperatorNameViewControllerTest.kt

+6 −5
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.keyguard.keyguardUpdateMonitor

import com.android.systemui.SysuiTestCase

import com.android.systemui.kosmos.testScope

import com.android.systemui.plugins.DarkIconDispatcher

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor
@@ -35,7 +36,7 @@ import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnec 
import com.android.systemui.testKosmos

import com.android.systemui.tuner.TunerService

import com.android.systemui.util.CarrierConfigTracker

import com.android.systemui.util.kotlin.JavaAdapter

import com.android.systemui.util.kotlin.javaAdapter

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever
@@ -57,10 +58,9 @@ class OperatorNameViewControllerTest : SysuiTestCase() { 
    private lateinit var airplaneModeInteractor: AirplaneModeInteractor



    private val kosmos = testKosmos()

    private val testScope = TestScope()

    private val testScope = kosmos.testScope



    private val view = OperatorNameView(mContext)

    private val javaAdapter = JavaAdapter(testScope.backgroundScope)



    @Mock private lateinit var darkIconDispatcher: DarkIconDispatcher

    @Mock private lateinit var tunerService: TunerService
@@ -82,7 +82,8 @@ class OperatorNameViewControllerTest : SysuiTestCase() { 
        testableResources = mContext.getOrCreateTestableResources()

        testableResources.addOverride(

            com.android.internal.R.integer.config_showOperatorNameDefault,

                1)

            1,

        )



        airplaneModeInteractor =

            AirplaneModeInteractor(
@@ -99,7 +100,7 @@ class OperatorNameViewControllerTest : SysuiTestCase() { 
                    carrierConfigTracker,

                    airplaneModeInteractor,

                    subscriptionManagerProxy,

                    javaAdapter,

                    kosmos.javaAdapter,

                )

                .create(view, darkIconDispatcher)

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import com.android.systemui.Flags.FLAG_STATUS_BAR_SIGNAL_POLICY_REFACTOR 
import com.android.systemui.SysuiTestCase

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.statusbar.connectivity.IconState

import com.android.systemui.statusbar.connectivity.NetworkController
@@ -40,7 +39,7 @@ import com.android.systemui.statusbar.pipeline.shared.data.repository.fake 
import com.android.systemui.statusbar.policy.SecurityController

import com.android.systemui.testKosmos

import com.android.systemui.tuner.tunerService

import com.android.systemui.util.kotlin.JavaAdapter

import com.android.systemui.util.kotlin.javaAdapter

import kotlin.test.Test

import org.junit.Before

import org.junit.runner.RunWith
@@ -57,7 +56,6 @@ import org.mockito.kotlin.verifyNoMoreInteractions 
class StatusBarSignalPolicyTest : SysuiTestCase() {

    private val kosmos = testKosmos().useUnconfinedTestDispatcher()



    private val javaAdapter = JavaAdapter(kosmos.testScope.backgroundScope)

    private val securityController = mock<SecurityController>()

    private val statusBarIconController = mock<StatusBarIconController>()

    private val networkController = mock<NetworkController>()