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

Commit 61d233c4 authored by wilsonshih's avatar wilsonshih
Browse files

Fix crash in ACC#convertTo/FromTranslucent. 

Fix a regression from Ic1cda79da37162cca2a1a3fbc73311cc325b3874.
The original CL is to create a new transition to ensure the visibility
of the activity would be correct if the activity is playing a
transition, so it is not necessary to create transition if another
transition is collecting.

Bug: 267616097
Test: atest ActivityVisibilityTests ActivityTransitionTest
Change-Id: Idcdf7c3fb2f44deb0c641ee4b2cd5c763abba473
parent 61a81e5e

services/core/java/com/android/server/wm/ActivityClientController.java

+2 −0
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
                // the running transition finish.

                final Transition transition = r != null

                        && r.mTransitionController.inPlayingTransition(r)

                        && !r.mTransitionController.isCollecting()

                        ? r.mTransitionController.createTransition(TRANSIT_TO_BACK) : null;

                if (transition != null) {

                    r.mTransitionController.requestStartTransition(transition, null /*startTask */,
@@ -820,6 +821,7 @@ class ActivityClientController extends IActivityClientController.Stub { 
                // visibility while playing transition, there won't able to commit visibility until

                // the running transition finish.

                final Transition transition = r.mTransitionController.inPlayingTransition(r)

                        && !r.mTransitionController.isCollecting()

                        ? r.mTransitionController.createTransition(TRANSIT_TO_FRONT) : null;

                if (transition != null) {

                    r.mTransitionController.requestStartTransition(transition, null /*startTask */,