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

Commit c5be0e43 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Kairos] Use repo for all fields in MobileConnectionRepoKairosAdapter 

In If250be73b3b86ac31237d4e11327c6233bc0221f, we're going to change the
CarrierMergedConnectionRepositoryKairos to use the carrier config for
`inflateSignalStrength`, but only if a certain flag is enabled. We want
the adapter to mimic that same behavior instead of always using the
carrier config.

This CL updates the adapter to just pull from the repo for every single
field and not use the carrier config at all.

Bug: 423686800
Flag: TEST_ONLY
Test: atest CarrierMergedConnectionRepositoryKairosAdapterTest
MobileConnectionKairosAdapterTelephonySmokeTests
MobileConnectionRepositoryKairosAdapterTest

Change-Id: I03ee53346f97f15e1a046e4b764fe85c42606fdf
parent 7f0e1c36

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepositoryKairosAdapterTest.kt

+1 −7
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import com.android.systemui.kairos.ExperimentalKairosApi 
import com.android.systemui.kairos.launchKairosNetwork

import com.android.systemui.kairos.stateOf

import com.android.systemui.kosmos.testScope

import com.android.systemui.statusbar.pipeline.mobile.data.model.SystemUiCarrierConfig

import com.android.systemui.statusbar.pipeline.mobile.data.model.testCarrierConfig

import com.android.systemui.statusbar.pipeline.wifi.data.repository.fake

import com.android.systemui.statusbar.pipeline.wifi.data.repository.wifiRepository

import kotlinx.coroutines.Job
@@ -60,11 +58,7 @@ class CarrierMergedConnectionRepositoryKairosAdapterTest : 
                            isInEcmMode = stateOf(false),

                        )

                    }

                    adapter =

                        MobileConnectionRepositoryKairosAdapter(

                            repo,

                            SystemUiCarrierConfig(SUB_ID, testCarrierConfig()),

                        )

                    adapter = MobileConnectionRepositoryKairosAdapter(repo)

                    Unit

                }

            }

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

+2 −7
Original line number Diff line number Diff line
@@ -79,13 +79,8 @@ constructor( 
    private val reposBySubIdK: Incremental<Int, MobileConnectionRepositoryKairosAdapter> =

        buildIncremental {

            kairosRepo.mobileConnectionsBySubId

                .mapValues { (subId, repo) ->

                    buildSpec {

                        MobileConnectionRepositoryKairosAdapter(

                            kairosRepo = repo,

                            carrierConfig = carrierConfigRepo.getOrCreateConfigForSubId(subId),

                        )

                    }

                .mapValues { (_, repo) ->

                    buildSpec { MobileConnectionRepositoryKairosAdapter(kairosRepo = repo) }

                }

                .applyLatestSpecForKey(

                    name = nameTag("MobileConnectionsRepositoryKairosAdapter.reposBySubIdK")

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosAdapter.kt

+13 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import com.android.systemui.log.table.TableLogBuffer 
import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState

import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel

import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType

import com.android.systemui.statusbar.pipeline.mobile.data.model.SystemUiCarrierConfig

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepositoryKairos

import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
@@ -32,8 +31,7 @@ import kotlinx.coroutines.flow.StateFlow 


@ExperimentalKairosApi

fun BuildScope.MobileConnectionRepositoryKairosAdapter(

    kairosRepo: MobileConnectionRepositoryKairos,

    carrierConfig: SystemUiCarrierConfig,

    kairosRepo: MobileConnectionRepositoryKairos

): MobileConnectionRepositoryKairosAdapter =

    MobileConnectionRepositoryKairosAdapter(

        subId = kairosRepo.subId,
@@ -43,8 +41,18 @@ fun BuildScope.MobileConnectionRepositoryKairosAdapter( 
                    "MobileConnectionRepositoryKairosAdapter(subId=${kairosRepo.subId}).carrierId"

                }

            ),

        inflateSignalStrength = carrierConfig.shouldInflateSignalStrength,

        allowNetworkSliceIndicator = carrierConfig.allowNetworkSliceIndicator,

        inflateSignalStrength =

            kairosRepo.inflateSignalStrength.toStateFlow(

                nameTag {

                    "MobileConnectionRepositoryKairosAdapter(subId=${kairosRepo.subId}).inflateSignalStrength"

                }

            ),

        allowNetworkSliceIndicator =

            kairosRepo.allowNetworkSliceIndicator.toStateFlow(

                nameTag {

                    "MobileConnectionRepositoryKairosAdapter(subId=${kairosRepo.subId}).allowNetworkSliceIndicator"

                }

            ),

        tableLogBuffer = kairosRepo.tableLogBuffer,

        isEmergencyOnly =

            kairosRepo.isEmergencyOnly.toStateFlow(

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionKairosAdapterTelephonySmokeTests.kt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class MobileConnectionKairosAdapterTelephonySmokeTests : MobileConnectionTelepho 
                            flags,

                        )

                    }

                    adapter = MobileConnectionRepositoryKairosAdapter(repo, systemUiCarrierConfig)

                    adapter = MobileConnectionRepositoryKairosAdapter(repo)

                    Unit

                }

            }

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryKairosAdapterTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class MobileConnectionRepositoryKairosAdapterTest : MobileConnectionRepositoryTe 
                            flags,

                        )

                    }

                    adapter = MobileConnectionRepositoryKairosAdapter(repo, systemUiCarrierConfig)

                    adapter = MobileConnectionRepositoryKairosAdapter(repo)

                    Unit

                }

            }