Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I14d4907c,I36555324 into tm-qpr-dev am: 90f6264a66

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

Change-Id: I298f1326b800641d1b572bf8a7dd56314b000adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Caitlin Shkuratov
2023-02-03 20:07:12 +00:00
committed by Automerger Merge Worker
parent 19139e0135 90f6264a66
commit b0fd87c2ac
4 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModel.kt
View File

@@ -26,6 +26,7 @@ import android.telephony.TelephonyCallback.ServiceStateListener
import android.telephony.TelephonyCallback.SignalStrengthsListener import android.telephony.TelephonyCallback.SignalStrengthsListener
import android.telephony.TelephonyDisplayInfo import android.telephony.TelephonyDisplayInfo
import android.telephony.TelephonyManager import android.telephony.TelephonyManager
import androidx.annotation.VisibleForTesting
import com.android.systemui.log.table.Diffable import com.android.systemui.log.table.Diffable
import com.android.systemui.log.table.TableRowLogger import com.android.systemui.log.table.TableRowLogger
import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Disconnected import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState.Disconnected
@@ -125,8 +126,12 @@ data class MobileConnectionModel(
row.logChange(COL_PRIMARY_LEVEL, primaryLevel) row.logChange(COL_PRIMARY_LEVEL, primaryLevel)
} }
if (prevVal.dataActivityDirection != dataActivityDirection) { if (prevVal.dataActivityDirection.hasActivityIn != dataActivityDirection.hasActivityIn) {
row.logChange(COL_ACTIVITY_DIRECTION, dataActivityDirection.toString()) 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) { if (prevVal.carrierNetworkChangeActive != carrierNetworkChangeActive) {
@@ -147,11 +152,13 @@ data class MobileConnectionModel(
row.logChange(COL_IS_GSM, isGsm) row.logChange(COL_IS_GSM, isGsm)
row.logChange(COL_CDMA_LEVEL, cdmaLevel) row.logChange(COL_CDMA_LEVEL, cdmaLevel)
row.logChange(COL_PRIMARY_LEVEL, primaryLevel) 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_CARRIER_NETWORK_CHANGE, carrierNetworkChangeActive)
row.logChange(COL_RESOLVED_NETWORK_TYPE, resolvedNetworkType.toString()) row.logChange(COL_RESOLVED_NETWORK_TYPE, resolvedNetworkType.toString())
} }
@VisibleForTesting
companion object { companion object {
const val COL_EMERGENCY = "EmergencyOnly" const val COL_EMERGENCY = "EmergencyOnly"
const val COL_ROAMING = "Roaming" const val COL_ROAMING = "Roaming"
@@ -161,7 +168,8 @@ data class MobileConnectionModel(
const val COL_CDMA_LEVEL = "CdmaLevel" const val COL_CDMA_LEVEL = "CdmaLevel"
const val COL_PRIMARY_LEVEL = "PrimaryLevel" const val COL_PRIMARY_LEVEL = "PrimaryLevel"
const val COL_CONNECTION_STATE = "ConnectionState" 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_CARRIER_NETWORK_CHANGE = "CarrierNetworkChangeActive"
const val COL_RESOLVED_NETWORK_TYPE = "NetworkType" const val COL_RESOLVED_NETWORK_TYPE = "NetworkType"
} }

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

@@ -95,7 +95,7 @@ constructor(
.logDiffsForTable( .logDiffsForTable(
wifiTableLogBuffer, wifiTableLogBuffer,
columnPrefix = "", columnPrefix = "",
columnName = "isWifiEnabled", columnName = "isEnabled",
initialValue = wifiManager.isWifiEnabled, initialValue = wifiManager.isWifiEnabled,
) )
.stateIn( .stateIn(
@@ -141,7 +141,7 @@ constructor(
.logDiffsForTable( .logDiffsForTable(
wifiTableLogBuffer, wifiTableLogBuffer,
columnPrefix = "", columnPrefix = "",
columnName = "isWifiDefault", columnName = "isDefault",
initialValue = false, initialValue = false,
) )
.stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false) .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false)
@@ -212,7 +212,7 @@ constructor(
.distinctUntilChanged() .distinctUntilChanged()
.logDiffsForTable( .logDiffsForTable(
wifiTableLogBuffer, wifiTableLogBuffer,
columnPrefix = "wifiNetwork", columnPrefix = "",
initialValue = WIFI_NETWORK_DEFAULT, initialValue = WIFI_NETWORK_DEFAULT,
) )
// There will be multiple wifi icons in different places that will frequently // There will be multiple wifi icons in different places that will frequently

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/model/WifiIcon.kt
View File

@@ -53,4 +53,4 @@ sealed interface WifiIcon : Diffable<WifiIcon> {
} }
} }
private const val COL_ICON = "wifiIcon" private const val COL_ICON = "icon"

17
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/model/MobileConnectionModelTest.kt
View File

@@ -19,7 +19,8 @@ package com.android.systemui.statusbar.pipeline.mobile.data.model
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.log.table.TableRowLogger 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_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_CDMA_LEVEL
import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel.Companion.COL_CONNECTION_STATE import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectionModel.Companion.COL_CONNECTION_STATE
@@ -54,7 +55,19 @@ class MobileConnectionModelTest : SysuiTestCase() {
assertThat(logger.changes) assertThat(logger.changes)
.contains(Pair(COL_CONNECTION_STATE, connection.dataConnectionState.toString())) .contains(Pair(COL_CONNECTION_STATE, connection.dataConnectionState.toString()))
assertThat(logger.changes) 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) assertThat(logger.changes)
.contains( .contains(
Pair(COL_CARRIER_NETWORK_CHANGE, connection.carrierNetworkChangeActive.toString()) Pair(COL_CARRIER_NETWORK_CHANGE, connection.carrierNetworkChangeActive.toString())