summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff DeCew <jeffdq@google.com> 2024-03-24 19:34:10 +0000
committer Jeff DeCew <jeffdq@google.com> 2024-03-25 15:27:54 +0000
commitbd5053076931f4c6b7501c7f89353f12e3088e9e (patch)
tree120535acda3d94b27b399149d0f3be772a39b8dc
parentc6d558544234c6b87d86d70813a012f94d141012 (diff)
[flexiglass] Fix compose crash when QS height hoes negative
Test: atest SystemUITests Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT Change-Id: Ie9ad4293575d322dcc455043b27e0ad7638f793f
-rw-r--r--packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
index 244861c277c6..a87a8df290b7 100644
--- a/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
+++ b/packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettings.kt
@@ -146,7 +146,7 @@ fun SceneScope.QuickSettings(
modifier.fillMaxWidth().layout { measurable, constraints ->
val placeable = measurable.measure(constraints)
// Use the height of the correct view based on the scene it is being composed in
- val height = heightProvider()
+ val height = heightProvider().coerceAtLeast(0)
layout(placeable.width, height) { placeable.placeRelative(0, 0) }
}