From 234544e8b47fe0555db457e197bfbbe9fea59c30 Mon Sep 17 00:00:00 2001
From: Lucas Silva <lusilva@google.com>
Date: Fri, 4 Mar 2022 14:09:51 -0500
Subject: [PATCH] Fix DreamBackend to reflect purely the WhenToDream setting.

The getWhenToDreamSetting method should return purely the WhenToDream
setting, and not the enabled setting. The enabled setting is now being
displayed separately as a toggle in settings.

Bug: 222360260
Test: locally on device
Change-Id: I93b11a6ee70ea4fa07ce9413a358a9c51bf108be
---
 .../src/com/android/settingslib/dream/DreamBackend.java        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
index fcb56d2f70169..01d0cc40c0bce 100644
--- 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