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

Commit 56352ca3 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Fix a small bug around deferring activity visibility" into sc-v2-dev... 

Merge "Fix a small bug around deferring activity visibility" into sc-v2-dev am: 08bcd0e8 am: 8cf3f74e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14786227

Change-Id: I8d1cadf5beabadf23a3c361af9f20ff93f94c4b3
parents e700f8a5 8cf3f74e

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

+1 −1
Original line number Diff line number Diff line
@@ -4569,7 +4569,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