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

Commit fa583f8a authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Release doze lock when the dream component changes" into tm-qpr-dev am:... 

Merge "Release doze lock when the dream component changes" into tm-qpr-dev am: 3437745a am: 88068858

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



Change-Id: Ie9322c9366e0b8c5672c67ac96af0ac4b18d0afa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 960d5c9d 88068858

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

+0 −3
Original line number Diff line number Diff line
@@ -294,8 +294,6 @@ final class DreamController { 
                        new int[] {ACTIVITY_TYPE_DREAM});



                mListener.onDreamStopped(dream.mToken);

            } else if (dream.mCanDoze && !mCurrentDream.mCanDoze) {

                mListener.stopDozing(dream.mToken);

            }



        } finally {
@@ -343,7 +341,6 @@ final class DreamController { 
     */

    public interface Listener {

        void onDreamStopped(Binder token);

        void stopDozing(Binder token);

    }



    private final class DreamRecord implements DeathRecipient, ServiceConnection {

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

+5 −11
Original line number Diff line number Diff line
@@ -500,12 +500,7 @@ public final class DreamManagerService extends SystemService { 
        }



        synchronized (mLock) {

            if (mCurrentDream == null) {

                return;

            }



            final boolean sameDream = mCurrentDream.token == token;

            if ((sameDream && mCurrentDream.isDozing) || (!sameDream && !mCurrentDream.isDozing)) {

            if (mCurrentDream != null && mCurrentDream.token == token && mCurrentDream.isDozing) {

                mCurrentDream.isDozing = false;

                mDozeWakeLock.release();

                mPowerManagerInternal.setDozeOverrideFromDreamManager(
@@ -671,6 +666,10 @@ public final class DreamManagerService extends SystemService { 


        Slog.i(TAG, "Entering dreamland.");



        if (mCurrentDream != null && mCurrentDream.isDozing) {

            stopDozingInternal(mCurrentDream.token);

        }



        mCurrentDream = new DreamRecord(name, userId, isPreviewMode, canDoze);



        if (!mCurrentDream.name.equals(mAmbientDisplayComponent)) {
@@ -776,11 +775,6 @@ public final class DreamManagerService extends SystemService { 
                }

            }

        }



        @Override

        public void stopDozing(Binder token) {

            stopDozingInternal(token);

        }

    };



    private final ContentObserver mDozeEnabledObserver = new ContentObserver(null) {