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

Commit 601f091a authored by Darrell Shi's avatar Darrell Shi Committed by Automerger Merge Worker
Browse files

Merge changes from topic "dream-restart-reland" into tm-qpr-dev am: ef7f9416 

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



Change-Id: I20df2e3e64c8ddb100f6455a8ddc344c3f5304d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b38f5ef ef7f9416

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

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

                }

            }