summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/src
diff options
context:
space:
mode:
author Lucas Silva <lusilva@google.com> 2025-02-13 14:14:13 -0800
committer Lucas Silva <lusilva@google.com> 2025-02-14 12:16:28 -0500
commit38a9eca9d4ceca8de937c82b753e93bb0de9e433 (patch)
tree11a454e58280ad833b52adaa86c9c8c8dff0a13a /packages/SettingsLib/src
parent828c910e20df07365294b49c57ff0994cd94a288 (diff)
Change when to dream ordering
If both charging and posturing are enabled, charging now takes priority. Bug: 396458606 Test: atest DreamBackendTest Flag: EXEMPT bugfix Change-Id: I0ecdbe9c4c747a274a8cd627b62d4888a6d140f0
Diffstat (limited to 'packages/SettingsLib/src')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java6
1 files changed, 3 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 51259e2f311d..e7887ed26cc3 100644
--- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
+++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
@@ -295,9 +295,9 @@ public class DreamBackend {
@WhenToDream
public int getWhenToDreamSetting() {
return isActivatedOnDock() && isActivatedOnSleep() ? WHILE_CHARGING_OR_DOCKED
- : isActivatedOnDock() ? WHILE_DOCKED
- : isActivatedOnPostured() ? WHILE_POSTURED
- : isActivatedOnSleep() ? WHILE_CHARGING
+ : isActivatedOnSleep() ? WHILE_CHARGING
+ : isActivatedOnDock() ? WHILE_DOCKED
+ : isActivatedOnPostured() ? WHILE_POSTURED
: NEVER;
}