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

Commit fb13701c authored by amehfooz's avatar amehfooz
Browse files

Add OngoingCallInteractor 

This CL removes dependency on OngoingCallController by introducing OngoingCallInteractor as the source of truth for ongoing call state.

The interactor:
Reads call notifications from ActiveNotificationsInteractor
Tracks call app visibility through ActivityManagerRepository
Emits ongoing call state through a Flow to CallChipInteractor


Bug:b/372657935
Flag: com.android.systemui.status_bar_chips_modernization

Change-Id: Ifd5ae9c3e566b99f268201f03db092850923eee6
parent d38e45cb

packages/SystemUI/aconfig/systemui.aconfig

+12 −0
Original line number Diff line number Diff line
@@ -434,6 +434,18 @@ flag { 
    }

}





flag {

    name: "status_bar_chips_modernization"

    namespace: "systemui"

    description: "Deprecate OngoingCallController and implement OngoingActivityChips"

    "in compose"

    bug: "372657935"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "status_bar_use_repos_for_call_chip"

    namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaListenerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ private const val PROC_STATE_INVISIBLE = ActivityManager.PROCESS_STATE_FOREGROUN 
@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper

@OptIn(ExperimentalCoroutinesApi::class)

@DisableFlags(FLAG_STATUS_BAR_USE_REPOS_FOR_CALL_CHIP)

@DisableFlags(FLAG_STATUS_BAR_USE_REPOS_FOR_CALL_CHIP, StatusBarChipsModernization.FLAG_NAME)

class OngoingCallControllerViaListenerTest : SysuiTestCase() {

    private val kosmos = Kosmos()

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaRepoTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.widget.LinearLayout 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON

import com.android.systemui.Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION

import com.android.systemui.Flags.FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS

import com.android.systemui.Flags.FLAG_STATUS_BAR_USE_REPOS_FOR_CALL_CHIP

import com.android.systemui.SysuiTestCase
@@ -77,6 +78,7 @@ import org.mockito.kotlin.whenever 
@TestableLooper.RunWithLooper

@OptIn(ExperimentalCoroutinesApi::class)

@EnableFlags(FLAG_STATUS_BAR_USE_REPOS_FOR_CALL_CHIP)

@DisableFlags(StatusBarChipsModernization.FLAG_NAME)

class OngoingCallControllerViaRepoTest : SysuiTestCase() {

    private val kosmos = Kosmos()

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepositoryTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ 


package com.android.systemui.statusbar.phone.ongoingcall.data.repository



import android.platform.test.annotations.DisableFlags

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION

import com.android.systemui.SysuiTestCase

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.inCallModel

import com.google.common.truth.Truth.assertThat
@@ -28,6 +31,7 @@ import org.junit.runner.RunWith 


@SmallTest

@RunWith(AndroidJUnit4::class)

@DisableFlags(StatusBarChipsModernization.FLAG_NAME)

class OngoingCallRepositoryTest : SysuiTestCase() {

    private val kosmos = Kosmos()

    private val underTest = kosmos.ongoingCallRepository

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractorTest.kt

0 → 100644
+208 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



@file:OptIn(ExperimentalCoroutinesApi::class)



package com.android.systemui.statusbar.phone.ongoingcall.domain.interactor



import android.app.PendingIntent

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.activity.data.repository.activityManagerRepository

import com.android.systemui.activity.data.repository.fake

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.collectLastValue

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.statusbar.StatusBarIconView

import com.android.systemui.statusbar.notification.data.model.activeNotificationModel

import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore

import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository

import com.android.systemui.statusbar.notification.shared.CallType

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.kotlin.mock



@SmallTest

@RunWith(AndroidJUnit4::class)

class OngoingCallInteractorTest : SysuiTestCase() {

    private val kosmos = Kosmos().useUnconfinedTestDispatcher()

    private val repository = kosmos.activeNotificationListRepository

    private val underTest = kosmos.ongoingCallInteractor



    @Test

    fun noNotification_emitsNoCall() = runTest {

        val state by collectLastValue(underTest.ongoingCallState)

        assertThat(state).isInstanceOf(OngoingCallModel.NoCall::class.java)

    }



    @Test

    fun ongoingCallNotification_setsNotificationIconAndIntent() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.ongoingCallState)



            // Set up notification with icon view and intent

            val testIconView: StatusBarIconView = mock()

            val testIntent: PendingIntent = mock()

            repository.activeNotifications.value =

                ActiveNotificationsStore.Builder()

                    .apply {

                        addIndividualNotif(

                            activeNotificationModel(

                                key = "notif1",

                                whenTime = 1000L,

                                callType = CallType.Ongoing,

                                statusBarChipIcon = testIconView,

                                contentIntent = testIntent

                            )

                        )

                    }

                    .build()



            // Verify model is InCall and has the correct icon and intent.

            assertThat(latest).isInstanceOf(OngoingCallModel.InCall::class.java)

            val model = latest as OngoingCallModel.InCall

            assertThat(model.notificationIconView).isSameInstanceAs(testIconView)

            assertThat(model.intent).isSameInstanceAs(testIntent)

        }



    @Test

    fun ongoingCallNotification_emitsInCall() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.ongoingCallState)



            repository.activeNotifications.value =

                ActiveNotificationsStore.Builder()

                    .apply {

                        addIndividualNotif(

                            activeNotificationModel(

                                key = "notif1", whenTime = 1000L, callType = CallType.Ongoing

                            )

                        )

                    }

                    .build()



            assertThat(latest).isInstanceOf(OngoingCallModel.InCall::class.java)

        }



    @Test

    fun notificationRemoved_emitsNoCall() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.ongoingCallState)



            repository.activeNotifications.value =

                ActiveNotificationsStore.Builder()

                    .apply {

                        addIndividualNotif(

                            activeNotificationModel(

                                key = "notif1", whenTime = 1000L, callType = CallType.Ongoing

                            )

                        )

                    }

                    .build()



            repository.activeNotifications.value = ActiveNotificationsStore()

            assertThat(latest).isInstanceOf(OngoingCallModel.NoCall::class.java)

        }



    @Test

    fun ongoingCallNotification_appVisibleInitially_emitsInCallWithVisibleApp() =

        kosmos.runTest {

            kosmos.activityManagerRepository.fake.startingIsAppVisibleValue = true

            val latest by collectLastValue(underTest.ongoingCallState)



            repository.activeNotifications.value =

                ActiveNotificationsStore.Builder()

                    .apply {

                        addIndividualNotif(

                            activeNotificationModel(

                                key = "notif1",

                                whenTime = 1000L,

                                callType = CallType.Ongoing,

                                uid = UID

                            )

                        )

                    }

                    .build()



            assertThat(latest).isInstanceOf(OngoingCallModel.InCallWithVisibleApp::class.java)

        }



    @Test

    fun ongoingCallNotification_appNotVisibleInitially_emitsInCall() =

        kosmos.runTest {

            kosmos.activityManagerRepository.fake.startingIsAppVisibleValue = false

            val latest by collectLastValue(underTest.ongoingCallState)



            repository.activeNotifications.value =

                ActiveNotificationsStore.Builder()

                    .apply {

                        addIndividualNotif(

                            activeNotificationModel(

                                key = "notif1",

                                whenTime = 1000L,

                                callType = CallType.Ongoing,

                                uid = UID

                            )

                        )

                    }

                    .build()



            assertThat(latest).isInstanceOf(OngoingCallModel.InCall::class.java)

        }



    @Test

    fun ongoingCallNotification_visibilityChanges_updatesState() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.ongoingCallState)



            // Start with notification and app not visible

            kosmos.activityManagerRepository.fake.startingIsAppVisibleValue = false

            repository.activeNotifications.value =

                ActiveNotificationsStore.Builder()

                    .apply {

                        addIndividualNotif(

                            activeNotificationModel(

                                key = "notif1",

                                whenTime = 1000L,

                                callType = CallType.Ongoing,

                                uid = UID

                            )

                        )

                    }

                    .build()

            assertThat(latest)

                .isInstanceOf(OngoingCallModel.InCall::class.java)



            // App becomes visible

            kosmos.activityManagerRepository.fake.setIsAppVisible(UID, true)

            assertThat(latest).isInstanceOf(OngoingCallModel.InCallWithVisibleApp::class.java)



            // App becomes invisible again

            kosmos.activityManagerRepository.fake.setIsAppVisible(UID, false)

            assertThat(latest).isInstanceOf(OngoingCallModel.InCall::class.java)

        }



    companion object {

        private const val UID = 885

    }

}