From 4b87b5784e1a1634cda0eec95a799afc2bc5eb4b Mon Sep 17 00:00:00 2001 From: Jordan Demeulenaere Date: Wed, 10 May 2023 21:40:40 +0000 Subject: [PATCH] Fix ComposeInitializerImpl Bug: 274722427 Change-Id: I7ae7dac97b0a148264075a942c77995a5a097d61 Merged-In: I7ae7dac97b0a148264075a942c77995a5a097d61 Test: SYSTEMUI_USE_COMPOSE=true m SystemUICompose and start SystemUI --- .../com/android/systemui/compose/ComposeInitializerImpl.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeInitializerImpl.kt b/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeInitializerImpl.kt index b84f71a0e68c5..1674591c30b56 100644 --- a/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeInitializerImpl.kt +++ b/packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeInitializerImpl.kt @@ -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]