From b7991ff0f0cc41608a637283a8cf6b95f604cda0 Mon Sep 17 00:00:00 2001
From: Robert Horvath <robhor@google.com>
Date: Tue, 23 May 2023 14:51:03 +0000
Subject: Add config to allow setting the default energy mode

Bug: 277727343
Test: Flash & observe default mode
Change-Id: I3177a0d3a321170bc8ea22285b3099e68ed8d89b
---
 Settings/res/values/energy-modes.xml                                | 3 +++
 .../src/com/android/tv/settings/device/eco/EnergyModesHelper.java   | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Settings/res/values/energy-modes.xml b/Settings/res/values/energy-modes.xml
index 50a1374e0..182796205 100644
--- a/Settings/res/values/energy-modes.xml
+++ b/Settings/res/values/energy-modes.xml
@@ -21,6 +21,9 @@
          If false, falls back to a toggle to enable/disable Low Power Standby if LPS is supported. -->
     <bool name="enable_energy_modes">true</bool>
 
+    <!-- The default energy mode, used if none has been set yet. -->
+    <string name="default_energy_mode" translatable="false">@null</string>
+
     <!-- Energy mode: Low -->
     <eat-comment />
 
diff --git a/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java b/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java
index f1901510c..e8ce5efd2 100644
--- a/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java
+++ b/Settings/src/com/android/tv/settings/device/eco/EnergyModesHelper.java
@@ -410,7 +410,7 @@ public final class EnergyModesHelper {
         if (!areEnergyModesAvailable()) {
             return null;
         }
-        return getEnergyModes().get(0);
+        return getEnergyMode(mContext.getString(R.string.default_energy_mode));
     }
 
     /**
@@ -466,6 +466,10 @@ public final class EnergyModesHelper {
                 targetEnergyMode = MODE_HIGH_ENERGY;
             } else {
                 targetEnergyMode = getDefaultEnergyMode();
+                if (targetEnergyMode == null) {
+                    // Fall back to lowest energy mode if default is not set or invalid
+                    targetEnergyMode = getEnergyModes().get(0);
+                }
             }
         }
 
-- 
cgit v1.2.3