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

Commit 5ac62c8c authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

Merge "Fix screen not turning off on power button press." into udc-dev am:... 

Merge "Fix screen not turning off on power button press." into udc-dev am: c601b238 am: 8b392e6a

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



Change-Id: I77065879a9c3d217c5e8b693d9553a4311e7f1b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2dff448 8b392e6a

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

+11 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ public final class DreamManagerService extends SystemService { 
    private final boolean mDreamsActivatedOnChargeByDefault;

    private final boolean mDreamsActivatedOnDockByDefault;

    private final boolean mKeepDreamingWhenUnpluggingDefault;

    private final boolean mDreamsDisabledByAmbientModeSuppressionConfig;



    private final CopyOnWriteArrayList<DreamManagerInternal.DreamManagerStateListener>

            mDreamManagerStateListeners = new CopyOnWriteArrayList<>();
@@ -239,6 +240,9 @@ public final class DreamManagerService extends SystemService { 
        mSettingsObserver = new SettingsObserver(mHandler);

        mKeepDreamingWhenUnpluggingDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_keepDreamingWhenUnplugging);

        mDreamsDisabledByAmbientModeSuppressionConfig = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_dreamsDisabledByAmbientModeSuppressionConfig);



    }



    @Override
@@ -406,6 +410,13 @@ public final class DreamManagerService extends SystemService { 
                return false;

            }



            if (mDreamsDisabledByAmbientModeSuppressionConfig

                    && mPowerManagerInternal.isAmbientDisplaySuppressed()) {

                // Don't dream if Bedtime (or something else) is suppressing ambient.

                Slog.i(TAG, "Can't start dreaming because ambient is suppressed.");

                return false;

            }



            if ((mWhenToDream & DREAM_ON_CHARGE) == DREAM_ON_CHARGE) {

                return mIsCharging;

            }