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

Merge "Fix crash in ACC#convertTo/FromTranslucent."

Browse Source
This commit is contained in:
Wei Sheng Shih
2023-02-09 01:43:04 +00:00
committed by Android (Google) Code Review
parent b4ff009051 61d233c454
commit 577c9de7be
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 */,