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

Commit 90f6264a authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I14d4907c,I36555324 into tm-qpr-dev 

* changes:
  [SB Refactor] Update the mobile activity logs to be in and out.
  [SB Refactor] Remove "wifi" from the wifi table column names.
parents 317336a8 49962c91

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

+12 −4
Original line number Diff line number Diff line
@@ -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"

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -53,4 +53,4 @@ sealed interface WifiIcon : Diffable<WifiIcon> { 
    }

}



private const val COL_ICON = "wifiIcon"
 
private const val COL_ICON = "icon"

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

+15 −2
Original line number Diff line number Diff line
@@ -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())