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

Browse Source
This commit is contained in:
Bryce Lee
2023-02-27 19:31:58 +00:00
committed by Android (Google) Code Review
parent 76bbdfda91 e2f1fb1d6b
commit bcdb5a0319
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; final DreamRecord oldDream = mCurrentDream;
mCurrentDream = new DreamRecord(token, name, isPreviewMode, canDoze, userId, wakeLock); mCurrentDream = new DreamRecord(token, name, isPreviewMode, canDoze, userId, wakeLock);
if (oldDream != null) { if (oldDream != null) {
if (!oldDream.mWakingGently) { if (Objects.equals(oldDream.mName, mCurrentDream.mName)) {
// We will stop these previous dreams once the new dream is started.
mPreviousDreams.add(oldDream);
} else if (Objects.equals(oldDream.mName, mCurrentDream.mName)) {
// We are attempting to start a dream that is currently waking up gently. // 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. // 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 // This should happen after the new mCurrentDream is set to avoid announcing
// a "dream stopped" state. // a "dream stopped" state.
stopDreamInstance(/* immediately */ true, "restarting same dream", oldDream); stopDreamInstance(/* immediately */ true, "restarting same dream", oldDream);
} else {
mPreviousDreams.add(oldDream);
} }
} }