From ecaff118fbe9088c0df26626bd7ffe5e81d910aa Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Tue, 1 Jun 2021 10:32:49 -0700 Subject: [PATCH] Fix a small bug around deferring activity visibility Making the defer specific to the activity instead of "while transition running". Otherwise, we can break changes in visibility that don't occur during a transition while a transition is running (eg. an app becoming visible due to an on-top app changing translucency). Bug: 183993924 Test: atest ActivityVisibilityTests#testConvertTranslucentOnNonTopTranslucentActivity Change-Id: I1589b4d47733ed4182e1e7b5b10fe7957b8dceea --- services/core/java/com/android/server/wm/ActivityRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 84782c420e2ca..9dd51f9e664d5 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -4567,7 +4567,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } // If in a transition, defer commits for activities that are going invisible - if (!visible && mAtmService.getTransitionController().inTransition()) { + if (!visible && mAtmService.getTransitionController().inTransition(this)) { return; } // If we are preparing an app transition, then delay changing