| commit | 4b87b5784e1a1634cda0eec95a799afc2bc5eb4b | [log] [tgz] |
|---|---|---|
| author | Jordan Demeulenaere <jdemeulenaere@google.com> | Wed May 10 21:40:40 2023 +0000 |
| committer | Jordan Demeulenaere <jdemeulenaere@google.com> | Wed Jul 05 14:33:11 2023 +0200 |
| tree | 7754e098bc21469617419e3362db5c4028f17602 | |
| parent | 52d705a8c4d81046d85e7dfb95bb1b2597ff8b0f [diff] |
Fix ComposeInitializerImpl Bug: 274722427 Change-Id: I7ae7dac97b0a148264075a942c77995a5a097d61 Merged-In: I7ae7dac97b0a148264075a942c77995a5a097d61 Test: SYSTEMUI_USE_COMPOSE=true m SystemUICompose and start SystemUI
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 b84f71a..1674591 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 @@ 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 @@ 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]