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

Commit 5c9e5613 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[SB Refactor] Log the mobile repo's default network callback." into... 

Merge "[SB Refactor] Log the mobile repo's default network callback." into tm-qpr-dev am: d411fe5a am: f5fe4bf2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609954



Change-Id: I73f4edbd28e5ca56f8a5df311a5207c4e3923f3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3248485b f5fe4bf2

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/MobileInputLogger.kt

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ constructor( 
        )

    }



    fun logOnLost(network: Network) {

        LoggerHelper.logOnLost(buffer, TAG, network)

    fun logOnLost(network: Network, isDefaultNetworkCallback: Boolean) {

        LoggerHelper.logOnLost(buffer, TAG, network, isDefaultNetworkCallback)

    }



    fun logOnServiceStateChanged(serviceState: ServiceState, subId: Int) {

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryImpl.kt

+6 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ constructor( 
                val callback =

                    object : NetworkCallback(FLAG_INCLUDE_LOCATION_INFO) {

                        override fun onLost(network: Network) {

                            logger.logOnLost(network, isDefaultNetworkCallback = true)

                            // Send a disconnected model when lost. Maybe should create a sealed

                            // type or null here?

                            trySend(MobileConnectivityModel())
@@ -275,6 +276,11 @@ constructor( 
                            network: Network,

                            caps: NetworkCapabilities

                        ) {

                            logger.logOnCapabilitiesChanged(

                                network,

                                caps,

                                isDefaultNetworkCallback = true,

                            )

                            trySend(

                                MobileConnectivityModel(

                                    isConnected = caps.hasTransport(TRANSPORT_CELLULAR),

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/LoggerHelper.kt

+16 −3
Original line number Diff line number Diff line
@@ -38,11 +38,24 @@ object LoggerHelper { 
                int1 = network.getNetId()

                str1 = networkCapabilities.toString()

            },

            { "onCapabilitiesChanged[default=$bool1]: net=$int1 capabilities=$str1" }

            { "on${if (bool1) "Default" else ""}CapabilitiesChanged: net=$int1 capabilities=$str1" }

        )

    }



    fun logOnLost(buffer: LogBuffer, tag: String, network: Network) {

        buffer.log(tag, LogLevel.INFO, { int1 = network.getNetId() }, { "onLost: net=$int1" })

    fun logOnLost(

        buffer: LogBuffer,

        tag: String,

        network: Network,

        isDefaultNetworkCallback: Boolean,

    ) {

        buffer.log(

            tag,

            LogLevel.INFO,

            {

                int1 = network.getNetId()

                bool1 = isDefaultNetworkCallback

            },

            { "on${if (bool1) "Default" else ""}Lost: net=$int1" }

        )

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt

+2 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ constructor( 
                        }



                        override fun onLost(network: Network) {

                            logger.logOnLost(network, isDefaultNetworkCallback = true)

                            // The system no longer has a default network, so wifi is definitely not

                            // default.

                            trySend(false)
@@ -179,7 +180,7 @@ constructor( 
                        }



                        override fun onLost(network: Network) {

                            logger.logOnLost(network)

                            logger.logOnLost(network, isDefaultNetworkCallback = false)



                            wifiNetworkChangeEvents.tryEmit(Unit)

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/WifiInputLogger.kt

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ constructor( 
        )

    }



    fun logOnLost(network: Network) {

        LoggerHelper.logOnLost(buffer, TAG, network)

    fun logOnLost(network: Network, isDefaultNetworkCallback: Boolean) {

        LoggerHelper.logOnLost(buffer, TAG, network, isDefaultNetworkCallback)

    }



    fun logIntent(intentName: String) {