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

Commit aa61c7ce authored by William Xiao's avatar William Xiao
Browse files

Move communal MediaHost init call to view model 

MediaHosts need to be initialized before the MediaHierarchyManager
attempts to move the UMO to said host or else a crash occurs.

MediaHosts can only be initialized once, which just registers them with
the MediaHierarchyManager. This CL moves the init from the AndroidView
factory, which only runs if media is active, to the ViewModel init, to
match the behavior of other MediaHosts.

Bug: 311234666
Fixed: 311234666
Test: atest CommunalViewModelTest
Flag: ACONFIG com.android.systemui.communal_hub DEVELOPMENT
Change-Id: I27b7ef1ff83e6dd48b0225ad920a8ca1e78b59c5
parent 2014926d

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+0 −6
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ import com.android.systemui.communal.domain.model.CommunalContentModel 
import com.android.systemui.communal.shared.model.CommunalContentSize

import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel

import com.android.systemui.communal.ui.viewmodel.CommunalEditModeViewModel

import com.android.systemui.media.controls.ui.MediaHierarchyManager

import com.android.systemui.media.controls.ui.MediaHostState

import com.android.systemui.res.R



@Composable
@@ -576,10 +574,6 @@ private fun Umo(viewModel: BaseCommunalViewModel, modifier: Modifier = Modifier) 
    AndroidView(

        modifier = modifier,

        factory = {

            viewModel.mediaHost.expansion = MediaHostState.EXPANDED

            viewModel.mediaHost.showsOnlyActiveMedia = false

            viewModel.mediaHost.falsingProtectionNeeded = false

            viewModel.mediaHost.init(MediaHierarchyManager.LOCATION_COMMUNAL_HUB)

            viewModel.mediaHost.hostView.layoutParams =

                FrameLayout.LayoutParams(

                    FrameLayout.LayoutParams.MATCH_PARENT,

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.communal.ui.viewmodel.CommunalViewModel.Companion.PO 
import com.android.systemui.communal.widgets.WidgetInteractionHandler

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository

import com.android.systemui.media.controls.ui.MediaHierarchyManager

import com.android.systemui.media.controls.ui.MediaHost

import com.android.systemui.shade.ShadeViewController

import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository
@@ -51,6 +52,7 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito

import org.mockito.Mockito.verify

import org.mockito.MockitoAnnotations



@OptIn(ExperimentalCoroutinesApi::class)
@@ -98,6 +100,13 @@ class CommunalViewModelTest : SysuiTestCase() { 
            )

    }



    @Test

    fun init_initsMediaHost() =

        testScope.runTest {

            // MediaHost is initialized as soon as the class is created.

            verify(mediaHost).init(MediaHierarchyManager.LOCATION_COMMUNAL_HUB)

        }



    @Test

    fun tutorial_tutorialNotCompletedAndKeyguardVisible_showTutorialContent() =

        testScope.runTest {

packages/SystemUI/src/com/android/systemui/communal/ui/viewmodel/CommunalViewModel.kt

+13 −0
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ import com.android.systemui.communal.domain.model.CommunalContentModel 
import com.android.systemui.communal.widgets.WidgetInteractionHandler

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.media.controls.ui.MediaHierarchyManager

import com.android.systemui.media.controls.ui.MediaHost

import com.android.systemui.media.controls.ui.MediaHostState

import com.android.systemui.media.dagger.MediaModule

import com.android.systemui.shade.ShadeViewController

import javax.inject.Inject
@@ -75,6 +77,17 @@ constructor( 
    override val isPopupOnDismissCtaShowing: Flow<Boolean> =

        _isPopupOnDismissCtaShowing.asStateFlow()



    init {

        // Initialize our media host for the UMO. This only needs to happen once and must be done

        // before the MediaHierarchyManager attempts to move the UMO to the hub.

        with(mediaHost) {

            expansion = MediaHostState.EXPANDED

            showsOnlyActiveMedia = false

            falsingProtectionNeeded = false

            init(MediaHierarchyManager.LOCATION_COMMUNAL_HUB)

        }

    }



    override fun onOpenWidgetEditor() = communalInteractor.showWidgetEditor()



    override fun onDismissCtaTile() {