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

Commit 166c45b6 authored by Evan Laird's avatar Evan Laird
Browse files

[mobile] add subId to carrier roaming callbacks 

This will help disambiguate them in the logs

Test: manual
Bug: 413149113
Flag: EXEMPT logging
Change-Id: I124c244a6b364bc09f3c1fcdf156ae5e52f61e8c
parent 73bbb1e0

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

+12 −6
Original line number Original line Diff line number Diff line
@@ -83,12 +83,15 @@ class MobileInputLogger @Inject constructor(@MobileInputLog private val buffer: 
        )

        )

    }

    }





    fun logNtnSignalStrengthChanged(signalStrength: NtnSignalStrength) {

    fun logNtnSignalStrengthChanged(signalStrength: NtnSignalStrength, subId: Int) {

        buffer.log(

        buffer.log(

            TAG,

            TAG,

            LogLevel.INFO,

            LogLevel.INFO,

            { int1 = signalStrength.level },

            {

            { "onCarrierRoamingNtnSignalStrengthChanged: level=$int1" },

                int1 = signalStrength.level

                int2 = subId

            },

            { "onCarrierRoamingNtnSignalStrengthChanged: subId=$int2 level=$int1" },

        )

        )

    }

    }
@@ -129,12 +132,15 @@ class MobileInputLogger @Inject constructor(@MobileInputLog private val buffer: 
        )

        )

    }

    }





    fun logOnCarrierRoamingNtnModeChanged(active: Boolean) {

    fun logOnCarrierRoamingNtnModeChanged(active: Boolean, subId: Int) {

        buffer.log(

        buffer.log(

            TAG,

            TAG,

            LogLevel.INFO,

            LogLevel.INFO,

            { bool1 = active },

            {

            { "onCarrierRoamingNtnModeChanged: $bool1" },

                int1 = subId

                bool1 = active

            },

            { "onCarrierRoamingNtnModeChanged: subId=$int1 active=$bool1" },

        )

        )

    }

    }

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -155,7 +155,7 @@ class MobileConnectionRepositoryImpl( 
                        }

                        }





                        override fun onCarrierRoamingNtnModeChanged(active: Boolean) {

                        override fun onCarrierRoamingNtnModeChanged(active: Boolean) {

                            logger.logOnCarrierRoamingNtnModeChanged(active)

                            logger.logOnCarrierRoamingNtnModeChanged(active, subId)

                            trySend(CallbackEvent.OnCarrierRoamingNtnModeChanged(active))

                            trySend(CallbackEvent.OnCarrierRoamingNtnModeChanged(active))

                        }

                        }
@@ -197,7 +197,7 @@ class MobileConnectionRepositoryImpl( 
                        override fun onCarrierRoamingNtnSignalStrengthChanged(

                        override fun onCarrierRoamingNtnSignalStrengthChanged(

                            signalStrength: NtnSignalStrength

                            signalStrength: NtnSignalStrength

                        ) {

                        ) {

                            logger.logNtnSignalStrengthChanged(signalStrength)

                            logger.logNtnSignalStrengthChanged(signalStrength, subId)

                            trySend(

                            trySend(

                                CallbackEvent.OnCarrierRoamingNtnSignalStrengthChanged(

                                CallbackEvent.OnCarrierRoamingNtnSignalStrengthChanged(

                                    signalStrength

                                    signalStrength

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -164,7 +164,7 @@ constructor( 
                    }

                    }





                    override fun onCarrierRoamingNtnModeChanged(active: Boolean) {

                    override fun onCarrierRoamingNtnModeChanged(active: Boolean) {

                        logger.logOnCarrierRoamingNtnModeChanged(active)

                        logger.logOnCarrierRoamingNtnModeChanged(active, subId)

                        emit(CallbackEvent.OnCarrierRoamingNtnModeChanged(active))

                        emit(CallbackEvent.OnCarrierRoamingNtnModeChanged(active))

                    }

                    }