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

Commit 9ce7d36f authored by Evan Laird's avatar Evan Laird
Browse files

[sat] add ktfmt formatting as its own CL 

Bug: 376310933
Flag: EXEMPT formatting
Test: NONE formatting
Change-Id: I27cfcd4d256ef88071bac4c3a9dbf7b78b760f0f
parent e5343009

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/satellite/data/demo/DemoDeviceBasedSatelliteRepositoryTest.kt

+5 −4
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ class DemoDeviceBasedSatelliteRepositoryTest : SysuiTestCase() { 
                whenever(it.satelliteEvents).thenReturn(fakeSatelliteEvents)

            }



        underTest = DemoDeviceBasedSatelliteRepository(

        underTest =

            DemoDeviceBasedSatelliteRepository(

                dataSource,

                testScope.backgroundScope,

                context.resources,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/DeviceBasedSatelliteRepositorySwitcher.kt

+1 −1
Original line number Diff line number Diff line
@@ -121,6 +121,6 @@ constructor( 
            .stateIn(

                scope,

                SharingStarted.WhileSubscribed(),

                realImpl.isSatelliteAllowedForCurrentLocation.value

                realImpl.isSatelliteAllowedForCurrentLocation.value,

            )

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/demo/DemoDeviceBasedSatelliteRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.pipeline.satellite.data.demo



import android.content.res.Resources

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.dagger.qualifiers.Main
@@ -27,7 +28,6 @@ import javax.inject.Inject 
import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Job

import kotlinx.coroutines.flow.MutableStateFlow

import com.android.app.tracing.coroutines.launchTraced as launch



/** A satellite repository that represents the latest satellite values sent via demo mode. */

@SysUISingleton

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.telephony.satellite.SatelliteModemStateCallback 
import android.telephony.satellite.SatelliteProvisionStateCallback

import android.telephony.satellite.SatelliteSupportedStateCallback

import androidx.annotation.VisibleForTesting

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application
@@ -69,7 +70,6 @@ import kotlinx.coroutines.flow.flowOn 
import kotlinx.coroutines.flow.mapNotNull

import kotlinx.coroutines.flow.onStart

import kotlinx.coroutines.flow.stateIn

import com.android.app.tracing.coroutines.launchTraced as launch

import kotlinx.coroutines.suspendCancellableCoroutine

import kotlinx.coroutines.withContext

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/domain/interactor/DeviceBasedSatelliteInteractor.kt

+4 −10
Original line number Diff line number Diff line
@@ -96,12 +96,7 @@ constructor( 
                flowOf(0)

            }

            .distinctUntilChanged()

            .logDiffsForTable(

                tableLog,

                columnPrefix = "",

                columnName = COL_LEVEL,

                initialValue = 0,

            )

            .logDiffsForTable(tableLog, columnPrefix = "", columnName = COL_LEVEL, initialValue = 0)

            .stateIn(scope, SharingStarted.WhileSubscribed(), 0)



    val isSatelliteProvisioned = repo.isSatelliteProvisioned
@@ -135,10 +130,9 @@ constructor( 
    /** When all connections are considered OOS, satellite connectivity is potentially valid */

    val areAllConnectionsOutOfService =

        if (Flags.oemEnabledSatelliteFlag()) {

                combine(

                    allConnectionsOos,

                    iconsInteractor.isDeviceInEmergencyCallsOnlyMode,

                ) { connectionsOos, deviceEmergencyOnly ->

                combine(allConnectionsOos, iconsInteractor.isDeviceInEmergencyCallsOnlyMode) {

                    connectionsOos,

                    deviceEmergencyOnly ->

                    logBuffer.log(

                        TAG,

                        LogLevel.INFO,