From 38a9eca9d4ceca8de937c82b753e93bb0de9e433 Mon Sep 17 00:00:00 2001
From: Lucas Silva <lusilva@google.com>
Date: Thu, 13 Feb 2025 14:14:13 -0800
Subject: 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
---
 .../SettingsLib/src/com/android/settingslib/dream/DreamBackend.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/SettingsLib/src')

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;
     }
 
-- 
cgit v1.2.3-59-g8ed1b