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

Commit 1b7e6bd5 authored by Evan Laird's avatar Evan Laird Committed by Android (Google) Code Review
Browse files

Merge "[sb] remove NEW_NETWORK_SLICE_UI classic flag" into main

parents 827e62a0 596a4635

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneContentViewModelTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.Flags

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.kosmos.testScope

import com.android.systemui.lifecycle.activateIn

import com.android.systemui.media.controls.data.repository.mediaFilterRepository
@@ -79,8 +77,6 @@ class QuickSettingsSceneContentViewModelTest : SysuiTestCase() { 


    @Before

    fun setUp() {

        kosmos.fakeFeatureFlagsClassic.set(Flags.NEW_NETWORK_SLICE_UI, false)



        sceneContainerStartable.start()

        underTest =

            QuickSettingsSceneContentViewModel(

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ import com.android.systemui.authentication.shared.model.AuthenticationMethodMode 
import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.Flags

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.domain.interactor.keyguardEnabledInteractor

import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus
@@ -68,8 +66,6 @@ class QuickSettingsUserActionsViewModelTest : SysuiTestCase() { 


    @Before

    fun setUp() {

        kosmos.fakeFeatureFlagsClassic.set(Flags.NEW_NETWORK_SLICE_UI, false)



        sceneContainerStartable.start()

        underTest =

            QuickSettingsUserActionsViewModel(

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ import com.android.systemui.bouncer.ui.viewmodel.bouncerOverlayContentViewModel 
import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository

import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.Flags

import com.android.systemui.flags.fakeFeatureFlagsClassic

import com.android.systemui.keyguard.KeyguardViewMediator

import com.android.systemui.keyguard.ui.viewmodel.lockscreenUserActionsViewModel

import com.android.systemui.kosmos.Kosmos
@@ -112,8 +110,6 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { 
            whenever(mockTelecomManager.isInCall).thenReturn(false)

            whenever(emergencyAffordanceManager.needsEmergencyAffordance()).thenReturn(true)



            fakeFeatureFlagsClassic.apply { set(Flags.NEW_NETWORK_SLICE_UI, false) }



            fakeMobileConnectionsRepository.isAnySimSecure.value = false



            fakeTelephonyRepository.apply {

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/LocationBasedMobileIconViewModelTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ class LocationBasedMobileIconViewModelTest : SysuiTestCase() { 
    private val connectivityRepository = FakeConnectivityRepository()

    private val flags =

        FakeFeatureFlagsClassic().also {

            it.set(Flags.NEW_NETWORK_SLICE_UI, false)

            it.set(Flags.FILTER_PROVISIONING_NETWORK_SUBSCRIPTIONS, true)

        }
@@ -133,7 +132,7 @@ class LocationBasedMobileIconViewModelTest : SysuiTestCase() { 
                iconsInteractor.isForceHidden,

                repository,

                context,

                MobileIconCarrierIdOverridesFake()

                MobileIconCarrierIdOverridesFake(),

            )



        commonImpl =
@@ -142,7 +141,6 @@ class LocationBasedMobileIconViewModelTest : SysuiTestCase() { 
                interactor,

                airplaneModeInteractor,

                constants,

                flags,

                testScope.backgroundScope,

            )

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconsViewModelTest.kt

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

import com.android.settingslib.mobile.TelephonyIcons

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.FakeFeatureFlagsClassic

import com.android.systemui.flags.Flags

import com.android.systemui.statusbar.phone.StatusBarLocation

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

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor
@@ -60,7 +58,6 @@ class MobileIconsViewModelTest : SysuiTestCase() { 


    private lateinit var underTest: MobileIconsViewModel

    private val interactor = FakeMobileIconsInteractor(FakeMobileMappingsProxy(), mock())

    private val flags = FakeFeatureFlagsClassic().also { it.set(Flags.NEW_NETWORK_SLICE_UI, false) }



    private lateinit var airplaneModeInteractor: AirplaneModeInteractor

    @Mock private lateinit var constants: ConnectivityConstants
@@ -88,7 +85,6 @@ class MobileIconsViewModelTest : SysuiTestCase() { 
                interactor,

                airplaneModeInteractor,

                constants,

                flags,

                testScope.backgroundScope,

            )
@@ -108,7 +104,7 @@ class MobileIconsViewModelTest : SysuiTestCase() { 
                        isOpportunistic = false,

                        carrierName = "Carrier 1",

                        profileClass = PROFILE_CLASS_UNSET,

                    ),

                    )

                )

            assertThat(latest).isEqualTo(listOf(1))