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

Commit e08f57dd authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Make the transition sleep failsafe stricter" into udc-dev

parents 1fd2378e 96af0f37

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ public class Transitions implements RemoteCallable<Transitions> { 
        }



        if (info.getType() == TRANSIT_SLEEP) {

            if (activeIdx > 0) {

            if (activeIdx > 0 || !mActiveTransitions.isEmpty() || mReadyTransitions.size() > 1) {

                // Sleep starts a process of forcing all prior transitions to finish immediately

                finishForSleep(null /* forceFinish */);

                return;