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

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

Merge "Abort queued-sleep transition if display shouldn't sleep anymore" into... 

Merge "Abort queued-sleep transition if display shouldn't sleep anymore" into udc-dev am: 99612743

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



Change-Id: Ib88fd12d05de0e4b34859e5e00063c446d84372a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0eef2859 99612743

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

+8 −4
Original line number Diff line number Diff line
@@ -2357,10 +2357,14 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                final Transition transition = new Transition(TRANSIT_SLEEP, 0 /* flags */,

                        display.mTransitionController, mWmService.mSyncEngine);

                final TransitionController.OnStartCollect sendSleepTransition = (deferred) -> {

                    if (deferred && !display.shouldSleep()) {

                        transition.abort();

                    } else {

                        display.mTransitionController.requestStartTransition(transition,

                                null /* trigger */, null /* remote */, null /* display */);

                        // Force playing immediately so that unrelated ops can't be collected.

                        transition.playNow();

                    }

                };

                if (!display.mTransitionController.isCollecting()) {

                    // Since this bypasses sync, submit directly ignoring whether sync-engine