Merge "Fix screen not turning off on power button press." into udc-dev (c601b238) · Commits · e / os / android_frameworks_base

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;
		}