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

Commit 648d6f0b authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: If164fab1a28c001c82ea9c309829ab3ad0229bd8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59cb2ee3 bcdb5a03

services/core/java/com/android/server/dreams/DreamController.java

+3 −4
Original line number Diff line number Diff line
@@ -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);

                }

            }