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

Commit 21fa0093 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB Refactor] Don't use ConnectivityPipelineLogger for the airplane VM. 

Bug: 238425913
Test: atest AirplaneModeViewModelImplTest
Test: `adb shell dumpsys activity service
com.android.systemui/.SystemUIService AirplaneTableLog` -> has
iconVisible logs

Change-Id: I89b8169908c84d4fec0bfa9bcd0e420e0972c27a
parent b48ee4cf

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/airplane/ui/viewmodel/AirplaneModeViewModel.kt

+10 −4
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel 


import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.log.table.TableLogBuffer

import com.android.systemui.log.table.logDiffsForTable

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.logOutputChange

import com.android.systemui.statusbar.pipeline.dagger.AirplaneTableLog

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.SharingStarted
@@ -46,7 +47,7 @@ class AirplaneModeViewModelImpl 
@Inject

constructor(

    interactor: AirplaneModeInteractor,

    logger: ConnectivityPipelineLogger,

    @AirplaneTableLog logger: TableLogBuffer,

    @Application private val scope: CoroutineScope,

) : AirplaneModeViewModel {

    override val isAirplaneModeIconVisible: StateFlow<Boolean> =
@@ -56,6 +57,11 @@ constructor( 
                isAirplaneMode && !isAirplaneIconForceHidden

            }

            .distinctUntilChanged()

            .logOutputChange(logger, "isAirplaneModeIconVisible")

            .logDiffsForTable(

                logger,

                columnPrefix = "",

                columnName = "isAirplaneModeIconVisible",

                initialValue = false,

            )

            .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false)

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/airplane/ui/viewmodel/AirplaneModeViewModelImplTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ package com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel 


import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.log.table.TableLogBuffer

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

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger

import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.google.common.truth.Truth.assertThat
@@ -42,7 +42,7 @@ class AirplaneModeViewModelImplTest : SysuiTestCase() { 


    private lateinit var underTest: AirplaneModeViewModelImpl



    @Mock private lateinit var logger: ConnectivityPipelineLogger

    @Mock private lateinit var logger: TableLogBuffer

    private lateinit var airplaneModeRepository: FakeAirplaneModeRepository

    private lateinit var connectivityRepository: FakeConnectivityRepository

    private lateinit var interactor: AirplaneModeInteractor

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.Airpla 
import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel

import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModelImpl

import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository

import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
@@ -63,7 +62,6 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() { 
    private lateinit var testableLooper: TestableLooper



    @Mock private lateinit var statusBarPipelineFlags: StatusBarPipelineFlags

    @Mock private lateinit var logger: ConnectivityPipelineLogger

    @Mock private lateinit var tableLogBuffer: TableLogBuffer

    @Mock private lateinit var connectivityConstants: ConnectivityConstants

    @Mock private lateinit var wifiConstants: WifiConstants
@@ -92,7 +90,7 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() { 
                    airplaneModeRepository,

                    connectivityRepository,

                ),

                logger,

                tableLogBuffer,

                scope,

            )

        viewModel =

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelIconParameterizedTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.Airpla 
import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel

import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModelImpl

import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger

import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
@@ -68,7 +67,6 @@ internal class WifiViewModelIconParameterizedTest(private val testCase: TestCase 
    private lateinit var underTest: WifiViewModel



    @Mock private lateinit var statusBarPipelineFlags: StatusBarPipelineFlags

    @Mock private lateinit var logger: ConnectivityPipelineLogger

    @Mock private lateinit var tableLogBuffer: TableLogBuffer

    @Mock private lateinit var connectivityConstants: ConnectivityConstants

    @Mock private lateinit var wifiConstants: WifiConstants
@@ -94,7 +92,7 @@ internal class WifiViewModelIconParameterizedTest(private val testCase: TestCase 
                    airplaneModeRepository,

                    connectivityRepository,

                ),

                logger,

                tableLogBuffer,

                scope,

            )

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.Airpla 
import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel

import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModelImpl

import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants

import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger

import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot

import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository
@@ -59,7 +58,6 @@ class WifiViewModelTest : SysuiTestCase() { 
    private lateinit var underTest: WifiViewModel



    @Mock private lateinit var statusBarPipelineFlags: StatusBarPipelineFlags

    @Mock private lateinit var logger: ConnectivityPipelineLogger

    @Mock private lateinit var tableLogBuffer: TableLogBuffer

    @Mock private lateinit var connectivityConstants: ConnectivityConstants

    @Mock private lateinit var wifiConstants: WifiConstants
@@ -85,7 +83,7 @@ class WifiViewModelTest : SysuiTestCase() { 
                    airplaneModeRepository,

                    connectivityRepository,

                ),

                logger,

                tableLogBuffer,

                scope,

            )