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

Commit e195c18f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Guard CommandQueueInitializer using `status_bar_connected_displays`... 

Merge "Guard CommandQueueInitializer using `status_bar_connected_displays` instead of `status_bar_simple_fragment`" into main
parents 05d3573f 4de4b233

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/CommandQueueInitializerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.kotlin.verify



@EnableFlags(StatusBarSimpleFragment.FLAG_NAME)

@EnableFlags(StatusBarConnectedDisplays.FLAG_NAME)

@SmallTest

@RunWith(AndroidJUnit4::class)

class CommandQueueInitializerTest : SysuiTestCase() {

packages/SystemUI/src/com/android/systemui/statusbar/core/CommandQueueInitializer.kt

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ constructor( 
) : CoreStartable {



    override fun start() {

        StatusBarSimpleFragment.assertInNewMode()

        StatusBarConnectedDisplays.assertInNewMode()

        val result: RegisterStatusBarResult =

            try {

                barService.registerStatusBar(commandQueue)

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ interface StatusBarPhoneModule { 
        fun commandQueueInitializerCoreStartable(

            initializerLazy: Lazy<CommandQueueInitializer>

        ): CoreStartable {

            return if (StatusBarSimpleFragment.isEnabled) {

            return if (StatusBarConnectedDisplays.isEnabled) {

                initializerLazy.get()

            } else {

                CoreStartable.NOP