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

[SB Refactor] Support network names for carrier merged.

Browse Source 
Bug: 264684296
Bug: 238425913
Test: atest CarrierMergedConnectionRepositoryTest
Change-Id: I6a6916fd5826bf0b1b412a3d95ba864e6dd5d64e
This commit is contained in:
Caitlin Shkuratov
2023-02-07 17:35:38 +00:00
parent e56123b679
commit 698a80bfdf
13 changed files with 120 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,15 +48,31 @@ sealed interface NetworkNameModel : Diffable<NetworkNameModel> {
* This name has been derived from telephony intents. see
* [android.telephony.TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED]
*/
data class Derived(override val name: String) : NetworkNameModel {
data class IntentDerived(override val name: String) : NetworkNameModel {
override fun logDiffs(prevVal: NetworkNameModel, row: TableRowLogger) {
if (prevVal !is Derived || prevVal.name != name) {
row.logChange(COL_NETWORK_NAME, "Derived($name)")
if (prevVal !is IntentDerived || prevVal.name != name) {
row.logChange(COL_NETWORK_NAME, "IntentDerived($name)")
}
}
override fun logFull(row: TableRowLogger) {
row.logChange(COL_NETWORK_NAME, "Derived($name)")
row.logChange(COL_NETWORK_NAME, "IntentDerived($name)")
}
}
/**
* This name has been derived from the sim via
* [android.telephony.TelephonyManager.getSimOperatorName].
*/
data class SimDerived(override val name: String) : NetworkNameModel {
override fun logDiffs(prevVal: NetworkNameModel, row: TableRowLogger) {
if (prevVal !is SimDerived || prevVal.name != name) {
row.logChange(COL_NETWORK_NAME, "SimDerived($name)")
}
}
override fun logFull(row: TableRowLogger) {
row.logChange(COL_NETWORK_NAME, "SimDerived($name)")
}
}
@@ -84,5 +100,5 @@ fun Intent.toNetworkNameModel(separator: String): NetworkNameModel? {
str.append(spn)
}
return if (str.isNotEmpty()) NetworkNameModel.Derived(str.toString()) else null
return if (str.isNotEmpty()) NetworkNameModel.IntentDerived(str.toString()) else null
}

6
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionsRepository.kt
View File

@@ -240,7 +240,7 @@ constructor(
// This is always true here, because we split out disabled states at the data-source level
connection.dataEnabled.value = true
connection.networkName.value = NetworkNameModel.Derived(state.name)
connection.networkName.value = NetworkNameModel.IntentDerived(state.name)
connection.cdmaRoaming.value = state.roaming
connection.connectionInfo.value = state.toMobileConnectionModel()
@@ -264,7 +264,7 @@ constructor(
val connection = getRepoForSubId(subId)
// This is always true here, because we split out disabled states at the data-source level
connection.dataEnabled.value = true
connection.networkName.value = NetworkNameModel.Derived(CARRIER_MERGED_NAME)
connection.networkName.value = NetworkNameModel.IntentDerived(CARRIER_MERGED_NAME)
connection.numberOfLevels.value = event.numberOfLevels
connection.cdmaRoaming.value = false
connection.connectionInfo.value = event.toMobileConnectionModel()
@@ -377,5 +377,5 @@ class DemoMobileConnectionRepository(
override val cdmaRoaming = MutableStateFlow(false)
override val networkName = MutableStateFlow(NetworkNameModel.Derived("demo network"))
override val networkName = MutableStateFlow(NetworkNameModel.IntentDerived("demo network"))
}

29
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt
View File

@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.pipeline.mobile.data.repository.prod
import android.telephony.TelephonyManager
import android.util.Log
import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Application
@@ -37,7 +38,6 @@ import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
@@ -54,10 +54,18 @@ import kotlinx.coroutines.flow.stateIn
class CarrierMergedConnectionRepository(
override val subId: Int,
override val tableLogBuffer: TableLogBuffer,
defaultNetworkName: NetworkNameModel,
private val telephonyManager: TelephonyManager,
@Application private val scope: CoroutineScope,
val wifiRepository: WifiRepository,
) : MobileConnectionRepository {
init {
if (telephonyManager.subscriptionId != subId) {
throw IllegalStateException(
"CarrierMergedRepo: TelephonyManager should be created with subId($subId). " +
"Found ${telephonyManager.subscriptionId} instead."
)
}
}
/**
* Outputs the carrier merged network to use, or null if we don't have a valid carrier merged
@@ -98,10 +106,17 @@ class CarrierMergedConnectionRepository(
override val cdmaRoaming: StateFlow<Boolean> = MutableStateFlow(ROAMING).asStateFlow()
// TODO(b/238425913): Fetch the carrier merged network name.
override val networkName: StateFlow<NetworkNameModel> =
flowOf(defaultNetworkName)
.stateIn(scope, SharingStarted.WhileSubscribed(), defaultNetworkName)
network
// The SIM operator name should be the same throughout the lifetime of a subId, **but**
// it may not be available when this repo is created because it takes time to load. To
// be safe, we re-fetch it each time the network has changed.
.map { NetworkNameModel.SimDerived(telephonyManager.simOperatorName) }
.stateIn(
scope,
SharingStarted.WhileSubscribed(),
NetworkNameModel.SimDerived(telephonyManager.simOperatorName),
)
override val numberOfLevels: StateFlow<Int> =
wifiRepository.wifiNetwork
@@ -150,18 +165,18 @@ class CarrierMergedConnectionRepository(
class Factory
@Inject
constructor(
private val telephonyManager: TelephonyManager,
@Application private val scope: CoroutineScope,
private val wifiRepository: WifiRepository,
) {
fun build(
subId: Int,
mobileLogger: TableLogBuffer,
defaultNetworkName: NetworkNameModel,
): MobileConnectionRepository {
return CarrierMergedConnectionRepository(
subId,
mobileLogger,
defaultNetworkName,
telephonyManager.createForSubscriptionId(subId),
scope,
wifiRepository,
)

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepository.kt
View File

@@ -86,7 +86,7 @@ class FullMobileConnectionRepository(
}
private val carrierMergedRepo: MobileConnectionRepository by lazy {
carrierMergedRepoFactory.build(subId, tableLogBuffer, defaultNetworkName)
carrierMergedRepoFactory.build(subId, tableLogBuffer)
}
@VisibleForTesting

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt
View File

@@ -92,7 +92,7 @@ class MobileConnectionRepositoryImpl(
init {
if (telephonyManager.subscriptionId != subId) {
throw IllegalStateException(
"TelephonyManager should be created with subId($subId). " +
"MobileRepo: TelephonyManager should be created with subId($subId). " +
"Found ${telephonyManager.subscriptionId} instead."
)
}

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractor.kt
View File

@@ -158,7 +158,7 @@ class MobileIconInteractorImpl(
if (
networkName is NetworkNameModel.Default && connection.operatorAlphaShort != null
) {
NetworkNameModel.Derived(connection.operatorAlphaShort)
NetworkNameModel.IntentDerived(connection.operatorAlphaShort)
} else {
networkName
}

3
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionParameterizedTest.kt
View File

@@ -138,7 +138,8 @@ internal class DemoMobileConnectionParameterizedTest(private val testCase: TestC
assertThat(connectionInfo.carrierNetworkChangeActive)
.isEqualTo(model.carrierNetworkChange)
assertThat(connectionInfo.isRoaming).isEqualTo(model.roaming)
assertThat(conn.networkName.value).isEqualTo(NetworkNameModel.Derived(model.name))
assertThat(conn.networkName.value)
.isEqualTo(NetworkNameModel.IntentDerived(model.name))
// TODO(b/261029387): check these once we start handling them
assertThat(connectionInfo.isEmergencyOnly).isFalse()

3
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/demo/DemoMobileConnectionsRepositoryTest.kt
View File

@@ -539,7 +539,8 @@ class DemoMobileConnectionsRepositoryTest : SysuiTestCase() {
assertThat(connectionInfo.carrierNetworkChangeActive)
.isEqualTo(model.carrierNetworkChange)
assertThat(connectionInfo.isRoaming).isEqualTo(model.roaming)
assertThat(conn.networkName.value).isEqualTo(NetworkNameModel.Derived(model.name))
assertThat(conn.networkName.value)
.isEqualTo(NetworkNameModel.IntentDerived(model.name))
// TODO(b/261029387) check these once we start handling them
assertThat(connectionInfo.isEmergencyOnly).isFalse()

45
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepositoryTest.kt
View File

@@ -16,6 +16,7 @@
package com.android.systemui.statusbar.pipeline.mobile.data.repository.prod
import android.telephony.TelephonyManager
import android.testing.AndroidTestingRunner
import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase
@@ -27,6 +28,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetwork
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
import com.android.systemui.util.mockito.whenever
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.launchIn
@@ -49,6 +51,7 @@ class CarrierMergedConnectionRepositoryTest : SysuiTestCase() {
private lateinit var wifiRepository: FakeWifiRepository
@Mock private lateinit var logger: TableLogBuffer
@Mock private lateinit var telephonyManager: TelephonyManager
private val testDispatcher = UnconfinedTestDispatcher()
private val testScope = TestScope(testDispatcher)
@@ -56,13 +59,16 @@ class CarrierMergedConnectionRepositoryTest : SysuiTestCase() {
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
whenever(telephonyManager.subscriptionId).thenReturn(SUB_ID)
whenever(telephonyManager.simOperatorName).thenReturn("")
wifiRepository = FakeWifiRepository()
underTest =
CarrierMergedConnectionRepository(
SUB_ID,
logger,
NetworkNameModel.Default("name"),
telephonyManager,
testScope.backgroundScope,
wifiRepository,
)
@@ -282,6 +288,43 @@ class CarrierMergedConnectionRepositoryTest : SysuiTestCase() {
job.cancel()
}
@Test
fun networkName_usesSimOperatorNameAsInitial() =
testScope.runTest {
whenever(telephonyManager.simOperatorName).thenReturn("Test SIM name")
var latest: NetworkNameModel? = null
val job = underTest.networkName.onEach { latest = it }.launchIn(this)
assertThat(latest).isEqualTo(NetworkNameModel.SimDerived("Test SIM name"))
job.cancel()
}
@Test
fun networkName_updatesOnNetworkUpdate() =
testScope.runTest {
whenever(telephonyManager.simOperatorName).thenReturn("Test SIM name")
var latest: NetworkNameModel? = null
val job = underTest.networkName.onEach { latest = it }.launchIn(this)
assertThat(latest).isEqualTo(NetworkNameModel.SimDerived("Test SIM name"))
whenever(telephonyManager.simOperatorName).thenReturn("New SIM name")
wifiRepository.setWifiNetwork(
WifiNetworkModel.CarrierMerged(
networkId = NET_ID,
subscriptionId = SUB_ID,
level = 3,
)
)
assertThat(latest).isEqualTo(NetworkNameModel.SimDerived("New SIM name"))
job.cancel()
}
private companion object {
const val SUB_ID = 123
const val NET_ID = 456

32
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt
View File

@@ -88,8 +88,7 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() {
)
)
.thenReturn(mobileRepo)
whenever(carrierMergedFactory.build(eq(SUB_ID), any(), eq(DEFAULT_NAME)))
.thenReturn(carrierMergedRepo)
whenever(carrierMergedFactory.build(eq(SUB_ID), any())).thenReturn(carrierMergedRepo)
}
@Test
@@ -127,7 +126,7 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() {
assertThat(underTest.activeRepo.value).isEqualTo(mobileRepo)
assertThat(underTest.connectionInfo.value).isEqualTo(mobileConnectionInfo)
verify(carrierMergedFactory, never()).build(SUB_ID, tableLogBuffer, DEFAULT_NAME)
verify(carrierMergedFactory, never()).build(SUB_ID, tableLogBuffer)
}
@Test
@@ -364,9 +363,10 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() {
fun connectionInfo_logging_notCarrierMerged_getsUpdates() =
testScope.runTest {
// SETUP: Use real repositories to verify the diffing still works. (See b/267501739.)
val telephonyManager = mock<TelephonyManager>()
val telephonyManager =
mock<TelephonyManager>().apply { whenever(this.simOperatorName).thenReturn("") }
createRealMobileRepo(telephonyManager)
createRealCarrierMergedRepo(FakeWifiRepository())
createRealCarrierMergedRepo(telephonyManager, FakeWifiRepository())
initializeRepo(startingIsCarrierMerged = false)
@@ -401,9 +401,11 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() {
fun connectionInfo_logging_carrierMerged_getsUpdates() =
testScope.runTest {
// SETUP: Use real repositories to verify the diffing still works. (See b/267501739.)
createRealMobileRepo(mock())
val telephonyManager =
mock<TelephonyManager>().apply { whenever(this.simOperatorName).thenReturn("") }
createRealMobileRepo(telephonyManager)
val wifiRepository = FakeWifiRepository()
createRealCarrierMergedRepo(wifiRepository)
createRealCarrierMergedRepo(telephonyManager, wifiRepository)
initializeRepo(startingIsCarrierMerged = true)
@@ -441,11 +443,12 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() {
fun connectionInfo_logging_updatesWhenCarrierMergedUpdates() =
testScope.runTest {
// SETUP: Use real repositories to verify the diffing still works. (See b/267501739.)
val telephonyManager = mock<TelephonyManager>()
val telephonyManager =
mock<TelephonyManager>().apply { whenever(this.simOperatorName).thenReturn("") }
createRealMobileRepo(telephonyManager)
val wifiRepository = FakeWifiRepository()
createRealCarrierMergedRepo(wifiRepository)
createRealCarrierMergedRepo(telephonyManager, wifiRepository)
initializeRepo(startingIsCarrierMerged = false)
@@ -516,11 +519,12 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() {
fun connectionInfo_logging_doesNotLogUpdatesForNotActiveRepo() =
testScope.runTest {
// SETUP: Use real repositories to verify the diffing still works. (See b/267501739.)
val telephonyManager = mock<TelephonyManager>()
val telephonyManager =
mock<TelephonyManager>().apply { whenever(this.simOperatorName).thenReturn("") }
createRealMobileRepo(telephonyManager)
val wifiRepository = FakeWifiRepository()
createRealCarrierMergedRepo(wifiRepository)
createRealCarrierMergedRepo(telephonyManager, wifiRepository)
// WHEN isCarrierMerged = false
initializeRepo(startingIsCarrierMerged = false)
@@ -617,6 +621,7 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() {
}
private fun createRealCarrierMergedRepo(
telephonyManager: TelephonyManager,
wifiRepository: FakeWifiRepository,
): CarrierMergedConnectionRepository {
wifiRepository.setIsWifiEnabled(true)
@@ -625,12 +630,11 @@ class FullMobileConnectionRepositoryTest : SysuiTestCase() {
CarrierMergedConnectionRepository(
SUB_ID,
tableLogBuffer,
defaultNetworkName = NetworkNameModel.Default("default"),
telephonyManager,
testScope.backgroundScope,
wifiRepository,
)
whenever(carrierMergedFactory.build(eq(SUB_ID), any(), eq(DEFAULT_NAME)))
.thenReturn(realRepo)
whenever(carrierMergedFactory.build(eq(SUB_ID), any())).thenReturn(realRepo)
return realRepo
}

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt
View File

@@ -94,6 +94,7 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() {
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
whenever(telephonyManager.simOperatorName).thenReturn("")
// Set up so the individual connection repositories
whenever(telephonyManager.createForSubscriptionId(anyInt())).thenAnswer { invocation ->
@@ -141,6 +142,7 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() {
)
carrierMergedFactory =
CarrierMergedConnectionRepository.Factory(
telephonyManager,
scope,
wifiRepository,
)

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/FakeMobileIconInteractor.kt
View File

@@ -45,7 +45,7 @@ class FakeMobileIconInteractor(
private val _iconGroup = MutableStateFlow<SignalIcon.MobileIconGroup>(TelephonyIcons.THREE_G)
override val networkTypeIconGroup = _iconGroup
override val networkName = MutableStateFlow(NetworkNameModel.Derived("demo mode"))
override val networkName = MutableStateFlow(NetworkNameModel.IntentDerived("demo mode"))
private val _isEmergencyOnly = MutableStateFlow(false)
override val isEmergencyOnly = _isEmergencyOnly

4
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconInteractorTest.kt
View File

@@ -531,7 +531,7 @@ class MobileIconInteractorTest : SysuiTestCase() {
)
yield()
assertThat(latest).isEqualTo(NetworkNameModel.Derived(testOperatorName))
assertThat(latest).isEqualTo(NetworkNameModel.IntentDerived(testOperatorName))
// Default network name, operator name is null, uses the default
connectionRepository.setConnectionInfo(MobileConnectionModel(operatorAlphaShort = null))
@@ -575,6 +575,6 @@ class MobileIconInteractorTest : SysuiTestCase() {
private const val SUB_1_ID = 1
private val DEFAULT_NAME = NetworkNameModel.Default("test default name")
private val DERIVED_NAME = NetworkNameModel.Derived("test derived name")
private val DERIVED_NAME = NetworkNameModel.IntentDerived("test derived name")
}
}