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

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

Merge "Revert "Temp tracking of plugin load/unload requests"" into udc-dev am:... 

Merge "Revert "Temp tracking of plugin load/unload requests"" into udc-dev am: ec55a87d am: e6d988e5 am: 7c7d4997

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



Change-Id: Ib9be153db31c2cf279f184ca6bbbce56d955a078
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12d1b6f8 7c7d4997

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

+0 −7
Original line number Diff line number Diff line
@@ -404,14 +404,12 @@ open class ClockRegistry( 
        }



        scope.launch(bgDispatcher) {

            Log.i(TAG, "verifyLoadedProviders: ${availableClocks.size}")

            if (keepAllLoaded) {

                // Enforce that all plugins are loaded if requested

                for ((_, info) in availableClocks) {

                    info.manager?.loadPlugin()

                }

                isVerifying.set(false)

                Log.i(TAG, "verifyLoadedProviders: keepAllLoaded=true, load all")

                return@launch

            }
@@ -422,21 +420,16 @@ open class ClockRegistry( 
                    info.manager?.unloadPlugin()

                }

                isVerifying.set(false)

                Log.i(TAG, "verifyLoadedProviders: currentClock unavailable, unload all")

                return@launch

            }



            val currentManager = currentClock.manager

            currentManager?.loadPlugin()

            Log.i(TAG, "verifyLoadedProviders: load ${currentClock.metadata.clockId}")



            for ((_, info) in availableClocks) {

                val manager = info.manager

                if (manager != null && manager.isLoaded && currentManager != manager) {

                    Log.i(TAG, "verifyLoadedProviders: unload ${info.metadata.clockId}")

                    manager.unloadPlugin()

                } else {

                    Log.i(TAG, "verifyLoadedProviders: skip unload of ${info.metadata.clockId}")

                }

            }

            isVerifying.set(false)