From a2307ed7b170c6bafe5c033bd2a9e6c9ca7429e4 Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Mon, 30 Jan 2023 21:23:46 +0000 Subject: [PATCH 1/2] [SB Refactor] Remove "wifi" from the wifi table column names. The logs are already put into the "WifiTableLog", so we don't need to include "wifi" in all the column names too. Bug: 238425913 Test: manual: Dumped WifiTableLog and verified new column names Change-Id: I36555324c6f89a0981aecbd52a84d1273297ea02 --- .../wifi/data/repository/prod/WifiRepositoryImpl.kt | 6 +++--- .../systemui/statusbar/pipeline/wifi/ui/model/WifiIcon.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt index 86690479f6794..c45b420780b91 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt @@ -95,7 +95,7 @@ constructor( .logDiffsForTable( wifiTableLogBuffer, columnPrefix = "", - columnName = "isWifiEnabled", + columnName = "isEnabled", initialValue = wifiManager.isWifiEnabled, ) .stateIn( @@ -141,7 +141,7 @@ constructor( .logDiffsForTable( wifiTableLogBuffer, columnPrefix = "", - columnName = "isWifiDefault", + columnName = "isDefault", initialValue = false, ) .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false) @@ -212,7 +212,7 @@ constructor( .distinctUntilChanged() .logDiffsForTable( wifiTableLogBuffer, - columnPrefix = "wifiNetwork", + columnPrefix = "", initialValue = WIFI_NETWORK_DEFAULT, ) // There will be multiple wifi icons in different places that will frequently diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/WifiIcon.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/WifiIcon.kt index e491d2bbf0d66..094bcf96eef98 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/WifiIcon.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/WifiIcon.kt @@ -53,4 +53,4 @@ sealed interface WifiIcon : Diffable { } } -private const val COL_ICON = "wifiIcon" +private const val COL_ICON = "icon" From 49962c919fea8dd8dac6c6f4de309835c6f14b06 Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Tue, 31 Jan 2023 14:33:21 +0000 Subject: [PATCH 2/2] [SB Refactor] Update the mobile activity logs to be in and out. We want to avoid calling `toString()` if we can, so it's better to log the two booleans that are part of the activity. Bug: 238425913 Test: Manual: Dumped MobileConnectionLog[3] and verified logs Change-Id: I14d4907c3a7bf1f73aeae8627038bd021805edcd --- .../mobile/data/model/MobileConnectionModel.kt | 16 ++++++++++++---- .../data/model/MobileConnectionModelTest.kt | 17 +++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModel.kt index 012b9ec09e7a0..4e55163ab78a4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModel.kt @@ -26,6 +26,7 @@ import android.telephony.TelephonyCallback.ServiceStateListener import android.telephony.TelephonyCallback.SignalStrengthsListener import android.telephony.TelephonyDisplayInfo import android.telephony.TelephonyManager +import androidx.annotation.VisibleForTesting import com.android.systemui.log.table.Diffable import com.android.systemui.log.table.TableRowLogger import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Disconnected @@ -125,8 +126,12 @@ data class MobileConnectionModel( row.logChange(COL_PRIMARY_LEVEL, primaryLevel) } - if (prevVal.dataActivityDirection != dataActivityDirection) { - row.logChange(COL_ACTIVITY_DIRECTION, dataActivityDirection.toString()) + if (prevVal.dataActivityDirection.hasActivityIn != dataActivityDirection.hasActivityIn) { + row.logChange(COL_ACTIVITY_DIRECTION_IN, dataActivityDirection.hasActivityIn) + } + + if (prevVal.dataActivityDirection.hasActivityOut != dataActivityDirection.hasActivityOut) { + row.logChange(COL_ACTIVITY_DIRECTION_OUT, dataActivityDirection.hasActivityOut) } if (prevVal.carrierNetworkChangeActive != carrierNetworkChangeActive) { @@ -147,11 +152,13 @@ data class MobileConnectionModel( row.logChange(COL_IS_GSM, isGsm) row.logChange(COL_CDMA_LEVEL, cdmaLevel) row.logChange(COL_PRIMARY_LEVEL, primaryLevel) - row.logChange(COL_ACTIVITY_DIRECTION, dataActivityDirection.toString()) + row.logChange(COL_ACTIVITY_DIRECTION_IN, dataActivityDirection.hasActivityIn) + row.logChange(COL_ACTIVITY_DIRECTION_OUT, dataActivityDirection.hasActivityOut) row.logChange(COL_CARRIER_NETWORK_CHANGE, carrierNetworkChangeActive) row.logChange(COL_RESOLVED_NETWORK_TYPE, resolvedNetworkType.toString()) } + @VisibleForTesting companion object { const val COL_EMERGENCY = "EmergencyOnly" const val COL_ROAMING = "Roaming" @@ -161,7 +168,8 @@ data class MobileConnectionModel( const val COL_CDMA_LEVEL = "CdmaLevel" const val COL_PRIMARY_LEVEL = "PrimaryLevel" const val COL_CONNECTION_STATE = "ConnectionState" - const val COL_ACTIVITY_DIRECTION = "DataActivity" + const val COL_ACTIVITY_DIRECTION_IN = "DataActivity.In" + const val COL_ACTIVITY_DIRECTION_OUT = "DataActivity.Out" const val COL_CARRIER_NETWORK_CHANGE = "CarrierNetworkChangeActive" const val COL_RESOLVED_NETWORK_TYPE = "NetworkType" } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModelTest.kt index f822ba0f0a622..45189cf8d432f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModelTest.kt @@ -19,7 +19,8 @@ package com.android.systemui.statusbar.pipeline.mobile.data.model import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.log.table.TableRowLogger -import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel.Companion.COL_ACTIVITY_DIRECTION +import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel.Companion.COL_ACTIVITY_DIRECTION_IN +import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel.Companion.COL_ACTIVITY_DIRECTION_OUT import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel.Companion.COL_CARRIER_NETWORK_CHANGE import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel.Companion.COL_CDMA_LEVEL import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel.Companion.COL_CONNECTION_STATE @@ -54,7 +55,19 @@ class MobileConnectionModelTest : SysuiTestCase() { assertThat(logger.changes) .contains(Pair(COL_CONNECTION_STATE, connection.dataConnectionState.toString())) assertThat(logger.changes) - .contains(Pair(COL_ACTIVITY_DIRECTION, connection.dataActivityDirection.toString())) + .contains( + Pair( + COL_ACTIVITY_DIRECTION_IN, + connection.dataActivityDirection.hasActivityIn.toString(), + ) + ) + assertThat(logger.changes) + .contains( + Pair( + COL_ACTIVITY_DIRECTION_OUT, + connection.dataActivityDirection.hasActivityOut.toString(), + ) + ) assertThat(logger.changes) .contains( Pair(COL_CARRIER_NETWORK_CHANGE, connection.carrierNetworkChangeActive.toString())