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

Commit c0f8c735 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Allow multiple clock plugins simultaneously" into tm-qpr-dev am: 5c4704b7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20057643



Change-Id: I9da33d5f444a497a5be73193cf62e9dd48d02722
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3c14772 5c4704b7

packages/SystemUI/shared/src/com/android/systemui/shared/clocks/ClockRegistry.kt

+2 −1
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/tests/src/com/android/systemui/shared/clocks/ClockRegistryTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -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

    }