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

Commit cc06de69 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: c601b238 

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



Change-Id: I9df11ffa8fff0e07c2a95efb68d244fc13794a1e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebaab164 c601b238

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

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

    private final boolean mDreamsActivatedOnChargeByDefault;

    private final boolean mDreamsActivatedOnDockByDefault;

    private final boolean mDreamsActivatedOnDockByDefault;

    private final boolean mKeepDreamingWhenUnpluggingDefault;

    private final boolean mKeepDreamingWhenUnpluggingDefault;

    private final boolean mDreamsDisabledByAmbientModeSuppressionConfig;





    private final CopyOnWriteArrayList<DreamManagerInternal.DreamManagerStateListener>

    private final CopyOnWriteArrayList<DreamManagerInternal.DreamManagerStateListener>

            mDreamManagerStateListeners = new CopyOnWriteArrayList<>();

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

        mSettingsObserver = new SettingsObserver(mHandler);

        mKeepDreamingWhenUnpluggingDefault = mContext.getResources().getBoolean(

        mKeepDreamingWhenUnpluggingDefault = mContext.getResources().getBoolean(

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

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

        mDreamsDisabledByAmbientModeSuppressionConfig = mContext.getResources().getBoolean(

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



    }

    }





    @Override

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

                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) {

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

                return mIsCharging;

                return mIsCharging;

            }

            }