From 61d233c454ba309abb09bd50ee3ff62893e73aa6 Mon Sep 17 00:00:00 2001 From: wilsonshih Date: Wed, 8 Feb 2023 14:32:00 +0800 Subject: [PATCH] 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 --- .../java/com/android/server/wm/ActivityClientController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/wm/ActivityClientController.java b/services/core/java/com/android/server/wm/ActivityClientController.java index 45076379dc4f2..502bfd1a5d67b 100644 --- a/services/core/java/com/android/server/wm/ActivityClientController.java +++ b/services/core/java/com/android/server/wm/ActivityClientController.java @@ -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 */,