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

Commit 768f8df2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I7ae7dac9,Ie142cac2 into udc-qpr-dev am: 7bffb9ff 

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



Change-Id: I88d6cdcb27f2ecbc73e4c5d8998b68abcfe128a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fce1330 7bffb9ff

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

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.compose 
import android.view.View

import androidx.lifecycle.findViewTreeLifecycleOwner

import androidx.lifecycle.setViewTreeLifecycleOwner

import androidx.lifecycle.Lifecycle

import androidx.savedstate.SavedStateRegistryController

import androidx.savedstate.SavedStateRegistryOwner

import com.android.compose.animation.ViewTreeSavedStateRegistryOwner
@@ -53,7 +54,8 @@ internal object ComposeInitializerImpl : ComposeInitializer { 


                override val savedStateRegistry = savedStateRegistryController.savedStateRegistry



                override val lifecycle = lifecycleOwner.lifecycle

                override val lifecycle: Lifecycle

                    get() = lifecycleOwner.lifecycle

            }



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