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

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

Change-Id: I9da33d5f444a497a5be73193cf62e9dd48d02722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Dupin
2022-09-27 17:30:23 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 2 deletions

View File

@@ -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,

View File

@@ -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
}