Merge "[mobile] add subId to carrier roaming callbacks" into main (055fa63f) · Commits · e / os / android_frameworks_base

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

+12 −6

Original line number	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(
		TAG,
		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(
		TAG,
		LogLevel.INFO,
		{ bool1 = active },
		{ "onCarrierRoamingNtnModeChanged: $bool1" },
		{
		int1 = subId
		bool1 = active
		},
		{ "onCarrierRoamingNtnModeChanged: subId=$int1 active=$bool1" },
		)
		}

+2 −2

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

		override fun onCarrierRoamingNtnModeChanged(active: Boolean) {
		logger.logOnCarrierRoamingNtnModeChanged(active)
		logger.logOnCarrierRoamingNtnModeChanged(active, subId)
		trySend(CallbackEvent.OnCarrierRoamingNtnModeChanged(active))
		}

		@@ -197,7 +197,7 @@ class MobileConnectionRepositoryImpl(
		override fun onCarrierRoamingNtnSignalStrengthChanged(
		signalStrength: NtnSignalStrength
		) {
		logger.logNtnSignalStrengthChanged(signalStrength)
		logger.logNtnSignalStrengthChanged(signalStrength, subId)
		trySend(
		CallbackEvent.OnCarrierRoamingNtnSignalStrengthChanged(
		signalStrength

+1 −1

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

		override fun onCarrierRoamingNtnModeChanged(active: Boolean) {
		logger.logOnCarrierRoamingNtnModeChanged(active)
		logger.logOnCarrierRoamingNtnModeChanged(active, subId)
		emit(CallbackEvent.OnCarrierRoamingNtnModeChanged(active))
		}