Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Rosky
2023-06-08 15:48:24 +00:00
committed by Android (Google) Code Review
parent c0fdac3dc7 f3306171de
commit 9961274383
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -2357,10 +2357,14 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
final Transition transition = new Transition(TRANSIT_SLEEP, 0 /* flags */, final Transition transition = new Transition(TRANSIT_SLEEP, 0 /* flags */,
display.mTransitionController, mWmService.mSyncEngine); display.mTransitionController, mWmService.mSyncEngine);
final TransitionController.OnStartCollect sendSleepTransition = (deferred) -> { final TransitionController.OnStartCollect sendSleepTransition = (deferred) -> {
display.mTransitionController.requestStartTransition(transition, if (deferred && !display.shouldSleep()) {
null /* trigger */, null /* remote */, null /* display */); transition.abort();
// Force playing immediately so that unrelated ops can't be collected. } else {
transition.playNow(); 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()) { if (!display.mTransitionController.isCollecting()) {
// Since this bypasses sync, submit directly ignoring whether sync-engine // Since this bypasses sync, submit directly ignoring whether sync-engine