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

Commit d816e811 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

Merge "Attempt to reload providers when selected provider is available but... 

Merge "Attempt to reload providers when selected provider is available but unloaded" into udc-qpr-dev am: 8b5ef0b1 am: a803fdee

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



Change-Id: I5efddba8e5e654bcbe5ea575945a78cf4b03f707
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27e32bad a803fdee

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

+8 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ open class ClockRegistry( 
            override fun onPluginAttached(

                manager: PluginLifecycleManager<ClockProviderPlugin>

            ): Boolean {

                manager.isDebug = true

                manager.isDebug = !keepAllLoaded



                if (keepAllLoaded) {

                    // Always load new plugins if requested
@@ -511,6 +511,12 @@ open class ClockRegistry( 
    fun verifyLoadedProviders() {

        val shouldSchedule = isVerifying.compareAndSet(false, true)

        if (!shouldSchedule) {

            logger.tryLog(

                TAG,

                LogLevel.VERBOSE,

                {},

                { "verifyLoadedProviders: shouldSchedule=false" }

            )

            return

        }
@@ -670,6 +676,7 @@ open class ClockRegistry( 
                    { str1 = clockId },

                    { "Clock $str1 not loaded; using default" }

                )

                verifyLoadedProviders()

            } else {

                logger.tryLog(

                    TAG,

packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginInstance.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class PluginInstance<T extends Plugin> implements PluginLifecycleManager 
        mComponentName = componentName;

        mPluginFactory = pluginFactory;

        mPlugin = plugin;

        mTag = TAG + mComponentName.toShortString()

        mTag = TAG + "[" + mComponentName.getShortClassName() + "]"

                + '@' + Integer.toHexString(hashCode());



        if (mPlugin != null) {