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

Add oldDream to mPreviousDreams always when dreams overlap

Browse Source 
Bug: 270178573
Test: start dream; press power button; wake up device; start dream;
      ensure dream starts
Change-Id: Ie601d2b4303340f89001265ba685ae97ee7fd6d8
(cherry picked from commit 01c6a7af31)
This commit is contained in:
Galia Peycheva
2023-02-22 15:00:07 +00:00
committed by Bryce Lee
parent d8f79f38fb
commit e2f1fb1d6b
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);
}
}