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

Commit 9abff9e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix ComposeInitializerImpl" into udc-dev am: 8cc2ef13 am: 44b35de4 

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



Change-Id: Icaeae98e01e915027c2e7591a57e8869ebafe2d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6976dad 44b35de4

packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeInitializerImpl.kt

+3 −5
Original line number Diff line number Diff line
@@ -49,14 +49,12 @@ internal object ComposeInitializerImpl : ComposeInitializer { 
        // initializer are created once, when the process is started.

        val savedStateRegistryOwner =

            object : SavedStateRegistryOwner {

                private val savedStateRegistry =

                private val savedStateRegistryController =

                    SavedStateRegistryController.create(this).apply { performRestore(null) }



                override fun getLifecycle(): Lifecycle = lifecycleOwner.lifecycle

                override val savedStateRegistry = savedStateRegistryController.savedStateRegistry



                override fun getSavedStateRegistry(): SavedStateRegistry {

                    return savedStateRegistry.savedStateRegistry

                }

                override fun getLifecycle(): Lifecycle = lifecycleOwner.lifecycle

            }



        // We must call [ViewLifecycleOwner.onCreate] after creating the [SavedStateRegistryOwner]