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

Bug: 270300839
Test: `adb shell dumpsys activity service
com.android.systemui/.SystemUIService MobileInputLog` -> has network
change logs

Change-Id: I3d1c873a35e8bee4b9a36a0521cec45ebb53fa71
This commit is contained in:
Caitlin Shkuratov
2023-03-06 20:02:28 +00:00
parent dccbda11b8
commit 7ce06035f2
6 changed files with 31 additions and 10 deletions

View File

@@ -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) {

View File

@@ -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),

View File

@@ -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" }
)
}
}

View File

@@ -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)

View File

@@ -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) {

View File

@@ -47,14 +47,14 @@ class MobileInputLoggerTest : SysuiTestCase() {
val expectedNetId = NET_1_ID.toString()
val expectedCaps = NET_1_CAPS.toString()
assertThat(actualString).contains("true")
assertThat(actualString).contains("onDefaultCapabilitiesChanged")
assertThat(actualString).contains(expectedNetId)
assertThat(actualString).contains(expectedCaps)
}
@Test
fun testLogOnLost_bufferHasNetIdOfLostNetwork() {
logger.logOnLost(NET_1)
logger.logOnLost(NET_1, isDefaultNetworkCallback = false)
val stringWriter = StringWriter()
buffer.dump(PrintWriter(stringWriter), tailLength = 0)
@@ -62,6 +62,7 @@ class MobileInputLoggerTest : SysuiTestCase() {
val expectedNetId = NET_1_ID.toString()
assertThat(actualString).contains("onLost")
assertThat(actualString).contains(expectedNetId)
}