summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jordan Demeulenaere <jdemeulenaere@google.com> 2023-05-10 21:40:40 +0000
committer Jordan Demeulenaere <jdemeulenaere@google.com> 2023-07-05 14:33:11 +0200
commit4b87b5784e1a1634cda0eec95a799afc2bc5eb4b (patch)
tree7754e098bc21469617419e3362db5c4028f17602
parent52d705a8c4d81046d85e7dfb95bb1b2597ff8b0f (diff)
Fix ComposeInitializerImpl
Bug: 274722427 Change-Id: I7ae7dac97b0a148264075a942c77995a5a097d61 Merged-In: I7ae7dac97b0a148264075a942c77995a5a097d61 Test: SYSTEMUI_USE_COMPOSE=true m SystemUICompose and start SystemUI
-rw-r--r--packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeInitializerImpl.kt4
1 files changed, 3 insertions, 1 deletions
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 b84f71a0e68c..1674591c30b5 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]