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

Merge "[SB Refactor] Use the calculated mobileIsDefault for failed connection." into udc-dev

Browse Source
This commit is contained in:
Caitlin Shkuratov
2023-05-05 20:39:49 +00:00
committed by Android (Google) Code Review
parent d5b4b9b950 970a8f6025
commit e7f2e5bc56
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,7 +259,7 @@ constructor(
*/ */
override val isDefaultConnectionFailed: StateFlow<Boolean> = override val isDefaultConnectionFailed: StateFlow<Boolean> =
combine( combine(
mobileConnectionsRepo.mobileIsDefault, mobileIsDefault,
mobileConnectionsRepo.defaultConnectionIsValidated, mobileConnectionsRepo.defaultConnectionIsValidated,
forcingCellularValidation, forcingCellularValidation,
) { mobileIsDefault, defaultConnectionIsValidated, forcingCellularValidation -> ) { mobileIsDefault, defaultConnectionIsValidated, forcingCellularValidation ->

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

@@ -361,6 +361,21 @@ class MobileIconsInteractorTest : SysuiTestCase() {
job.cancel() job.cancel()
} }
@Test
fun failedConnection_carrierMergedDefault_notValidated_failed() =
testScope.runTest {
var latest: Boolean? = null
val job = underTest.isDefaultConnectionFailed.onEach { latest = it }.launchIn(this)
connectionsRepository.hasCarrierMergedConnection.value = true
connectionsRepository.defaultConnectionIsValidated.value = false
yield()
assertThat(latest).isTrue()
job.cancel()
}
/** Regression test for b/275076959. */ /** Regression test for b/275076959. */
@Test @Test
fun failedConnection_dataSwitchInSameGroup_notFailed() = fun failedConnection_dataSwitchInSameGroup_notFailed() =