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

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

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

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



Change-Id: I189679a4517ca886fe87fd7d4e3d921801e95b34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4354a83 e08f57dd

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;