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

Commit 76af12a2 authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Disable home control dream when flag disabled" into main

parents 9df46c77 65fd5398

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/homecontrols/HomeControlsDreamStartableTest.kt

+7 −4
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.testKosmos

import com.android.systemui.user.data.repository.FakeUserRepository

import com.android.systemui.user.data.repository.fakeUserRepository

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.whenever

import java.util.Optional
@@ -50,7 +49,6 @@ import org.junit.Before 
import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.MockitoAnnotations
@@ -136,12 +134,17 @@ class HomeControlsDreamStartableTest : SysuiTestCase() { 


    @Test

    @DisableFlags(FLAG_HOME_PANEL_DREAM)

    fun testStartDoesNotRunDreamServiceWhenFlagIsDisabled() =

    fun testStartDisablesDreamServiceWhenFlagIsDisabled() =

        testScope.runTest {

            selectedComponentRepository.setSelectedComponent(TEST_SELECTED_COMPONENT_NON_PANEL)

            startable.start()

            runCurrent()

            verify(packageManager, never()).setComponentEnabledSetting(any(), any(), any())

            verify(packageManager)

                .setComponentEnabledSetting(

                    eq(componentName),

                    eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED),

                    eq(PackageManager.DONT_KILL_APP)

                )

        }



    private fun ControlsServiceInfo(

packages/SystemUI/src/com/android/systemui/dreams/homecontrols/HomeControlsDreamStartable.kt

+7 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import kotlinx.coroutines.launch 
class HomeControlsDreamStartable

@Inject

constructor(

    private val context: Context,

    context: Context,

    private val packageManager: PackageManager,

    private val homeControlsComponentInteractor: HomeControlsComponentInteractor,

    @Background private val bgScope: CoroutineScope,
@@ -39,11 +39,14 @@ constructor( 
    private val componentName = ComponentName(context, HomeControlsDreamService::class.java)



    override fun start() {

        if (!homePanelDream()) return

        bgScope.launch {

            if (homePanelDream()) {

                homeControlsComponentInteractor.panelComponent.collect { selectedPanelComponent ->

                    setEnableHomeControlPanel(selectedPanelComponent != null)

                }

            } else {

                setEnableHomeControlPanel(false)

            }

        }

    }