Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in ACC#convertTo/FromTranslucent.

Browse Source 
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
This commit is contained in:
wilsonshih
2023-02-08 14:32:00 +08:00
parent 61a81e5e78
commit 61d233c454
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityClientController.java
View File

@@ -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 */,