summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author Andrey Yepin <ayepin@google.com> 2024-07-24 04:58:16 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-07-24 04:58:16 +0000
commit4bd8bd63d47254ef9d8776c2792d1304556d40cc (patch)
treedfbf653b731e45497c5fd6d2b324afe335f5817a /java/src
parent948c0b255ebb6fe4b38ab6d83cc9b474dffe1b70 (diff)
parent78e45e942cce4144fe772955631794389a41c156 (diff)
Merge "Do not crash if max aspect ratio falls below min aspect ratio" into main
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
index 9ac36a87..e8d75c8f 100644
--- a/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
+++ b/java/src/com/android/intentresolver/contentpreview/payloadtoggle/ui/composable/ShareouselComposable.kt
@@ -205,7 +205,7 @@ private fun ShareouselCard(viewModel: ShareouselPreviewViewModel, maxAspectRatio
onValueChange = { scope.launch { viewModel.setSelected(it) } },
)
) { state ->
- val aspectRatio = viewModel.aspectRatio.coerceIn(MIN_ASPECT_RATIO, maxAspectRatio)
+ val aspectRatio = minOf(maxAspectRatio, maxOf(MIN_ASPECT_RATIO, viewModel.aspectRatio))
if (state is ValueUpdate.Value) {
state.getOrDefault(null).let { bitmap ->
ShareouselCard(