diff options
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/CommandQueueInitializerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/CommandQueueInitializerTest.kt index 2a196c6b979f..1b3f29a6f0c5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/CommandQueueInitializerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/CommandQueueInitializerTest.kt @@ -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() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/core/CommandQueueInitializer.kt b/packages/SystemUI/src/com/android/systemui/statusbar/core/CommandQueueInitializer.kt index 57c8bc6133e6..614f0f48d1fc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/core/CommandQueueInitializer.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/core/CommandQueueInitializer.kt @@ -46,7 +46,7 @@ constructor( ) : CoreStartable { override fun start() { - StatusBarSimpleFragment.assertInNewMode() + StatusBarConnectedDisplays.assertInNewMode() val result: RegisterStatusBarResult = try { barService.registerStatusBar(commandQueue) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt index e4a75beca9f9..23f3482d40bd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt @@ -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 |