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

Commit 33df5bb6 authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Fix isInCallFlow when no active subscription am: c63f06d4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27205448



Change-Id: I5a58046c3e7ed2a1164648516248b39ee4feb5ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0212b677 c63f06d4

src/com/android/settings/network/telephony/CallStateRepository.kt

+7 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import kotlinx.coroutines.flow.Flow 
import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.conflate

import kotlinx.coroutines.flow.flatMapLatest

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.flow.flowOn

import kotlinx.coroutines.flow.onEach
@@ -50,10 +51,14 @@ class CallStateRepository(private val context: Context) { 
    fun isInCallFlow(): Flow<Boolean> = context.subscriptionsChangedFlow()

        .flatMapLatest {

            val subIds = subscriptionManager.activeSubscriptionIdList

            if (subIds.isEmpty()) {

                flowOf(false)

            } else {

                combine(subIds.map(::callStateFlow)) { states ->

                    states.any { it != TelephonyManager.CALL_STATE_IDLE }

                }

            }

        }

        .conflate()

        .flowOn(Dispatchers.Default)

        .onEach { Log.d(TAG, "isInCallFlow: $it") }

tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt

+12 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import org.mockito.kotlin.doAnswer 
import org.mockito.kotlin.doReturn

import org.mockito.kotlin.mock

import org.mockito.kotlin.spy

import org.mockito.kotlin.stub



@RunWith(AndroidJUnit4::class)

class CallStateRepositoryTest {
@@ -86,6 +87,17 @@ class CallStateRepositoryTest { 
            .inOrder()

    }



    @Test

    fun isInCallFlow_noActiveSubscription() = runBlocking {

        mockSubscriptionManager.stub {

            on { activeSubscriptionIdList } doReturn intArrayOf()

        }



        val isInCall = repository.isInCallFlow().firstWithTimeoutOrNull()



        assertThat(isInCall).isFalse()

    }



    @Test

    fun isInCallFlow_initial() = runBlocking {

        val isInCall = repository.isInCallFlow().firstWithTimeoutOrNull()