Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c0b1910 authored by Darrell Shi's avatar Darrell Shi
Browse files

Prevent crash in communal scene transition 

This change handles the case where fromContent.targetSize() returns null
because it has not been composed. We provide a fallback value, which
prevents a crash.

Fix: 440152000
Test: n/a
Flag: EXEMPT bugfix
Change-Id: I0f617836bdf496e6f7ba9fe39758796fc07ad1ac
parent ccfa6c76

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+3 −2
Original line number Diff line number Diff line
@@ -118,8 +118,9 @@ val sceneTransitionsV2 = transitions { 
        translate(Communal.Elements.Grid, Edge.End)

        if (Flags.gestureBetweenHubAndLockscreenMotion()) {

            distance = UserActionDistance { fromContent, _, _ ->

                val fromContentSize = checkNotNull(fromContent.targetSize())

                fromContentSize.width * 0.5f

                // fromContent size can be null if it hasn't been compose yet, in which case we

                // fall back to 0.

                fromContent.targetSize()?.width?.times(0.5f) ?: 0f

            }

            timestampRange(startMillis = 167, endMillis = 334) { fade(Communal.Elements.StatusBar) }

        } else {