diff options
| author | 2022-03-08 17:54:27 +0000 | |
|---|---|---|
| committer | 2022-03-08 17:54:27 +0000 | |
| commit | 485b25212bd1ce17c6da24991e309c5647cca973 (patch) | |
| tree | 04c5cdd004be3a069144946dacb653377397f837 | |
| parent | df451e3e662f820c56197446410a750c47113ec0 (diff) | |
| parent | 234544e8b47fe0555db457e197bfbbe9fea59c30 (diff) | |
Merge "Fix DreamBackend to reflect purely the WhenToDream setting." into tm-dev
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java | 3 |
1 files changed, 0 insertions, 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 fcb56d2f7016..01d0cc40c0bc 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 |