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

Merge "Add oldDream to mPreviousDreams always when dreams overlap" into udc-dev am: bcdb5a0319 am: 7a95008577

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

Change-Id: Ib7612b4065ee546191ee3483be9c28b260baf7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bryce Lee
2023-02-27 20:10:49 +00:00
committed by Automerger Merge Worker
parent 53376afec9 7a95008577
commit c4e79ddc73
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/dreams/DreamController.java
View File

@@ -158,15 +158,14 @@ final class DreamController {
final DreamRecord oldDream = mCurrentDream;
mCurrentDream = new DreamRecord(token, name, isPreviewMode, canDoze, userId, wakeLock);
if (oldDream != null) {
if (!oldDream.mWakingGently) {
// We will stop these previous dreams once the new dream is started.
mPreviousDreams.add(oldDream);
} else if (Objects.equals(oldDream.mName, mCurrentDream.mName)) {
if (Objects.equals(oldDream.mName, mCurrentDream.mName)) {
// We are attempting to start a dream that is currently waking up gently.
// Let's silently stop the old instance here to clear the dream state.
// This should happen after the new mCurrentDream is set to avoid announcing
// a "dream stopped" state.
stopDreamInstance(/* immediately */ true, "restarting same dream", oldDream);
} else {
mPreviousDreams.add(oldDream);
}
}