From e601a67d00f158f020fc81fc3e3362802cc39b89 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Mon, 26 Sep 2022 13:57:19 -0700 Subject: [PATCH] Allow multiple clock plugins simultaneously Test: atest ClockRegistryTest Bug: 248101364 Change-Id: I92380d19fcbbbcdb3d3c5d292d44fd57f8595996 --- .../src/com/android/systemui/shared/clocks/ClockRegistry.kt | 3 ++- .../com/android/systemui/shared/clocks/ClockRegistryTest.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt index 835d6e92a63d4..38a312448bab6 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt @@ -105,7 +105,8 @@ open class ClockRegistry( ) } - pluginManager.addPluginListener(pluginListener, ClockProviderPlugin::class.java) + pluginManager.addPluginListener(pluginListener, ClockProviderPlugin::class.java, + true /* allowMultiple */) context.contentResolver.registerContentObserver( Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE), false, diff --git a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt index 131eac668af3b..8be138a3b2be5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt @@ -113,7 +113,7 @@ class ClockRegistryTest : SysuiTestCase() { registry.isEnabled = true verify(mockPluginManager) - .addPluginListener(captor.capture(), eq(ClockProviderPlugin::class.java)) + .addPluginListener(captor.capture(), eq(ClockProviderPlugin::class.java), eq(true)) pluginListener = captor.value }