Merge "Fix DreamBackend to reflect purely the WhenToDream setting." into tm-dev am: 485b25212b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084865 Change-Id: Ib95962edc00d2b7ca5033445ae95bb199beb7695
2022-03-08 18:03:13 +00:00
parent e418f76d0d 485b25212b
commit b9184badcf
1 changed files with 0 additions and 3 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
+++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
@@ -248,9 +248,6 @@ public class DreamBackend {
    }

    public @WhenToDream int getWhenToDreamSetting() {
-        if (!isEnabled()) {
-            return NEVER;
-        }
        return isActivatedOnDock() && isActivatedOnSleep() ? EITHER
                : isActivatedOnDock() ? WHILE_DOCKED
                : isActivatedOnSleep() ? WHILE_CHARGING