From 6391431d8965c8df3bf74a3cc471a480015cf9e1 Mon Sep 17 00:00:00 2001
From: Shinru Han <shinruhan@google.com>
Date: Thu, 1 Aug 2024 09:18:18 +0000
Subject: [PATCH 1/2] gps: Re-enable GLO & QZSS in US

Test: on-device
Bug: 353579502
Change-Id: I9186c0cd69e61c9e2a772e47531e7626c91fdaa4
---
 location/gps.6.1.xml.hk3      | 2 ++
 location/gps.6.1.xml.sb3      | 2 ++
 location/gps.xml.hk3          | 2 ++
 location/gps.xml.sb3          | 2 ++
 location/gps_user.6.1.xml.hk3 | 2 ++
 location/gps_user.6.1.xml.sb3 | 2 ++
 location/gps_user.xml         | 2 ++
 location/gps_user.xml.hk3     | 2 ++
 location/gps_user.xml.sb3     | 2 ++
 9 files changed, 18 insertions(+)

diff --git a/location/gps.6.1.xml.hk3 b/location/gps.6.1.xml.hk3
index 20329db..cf2fceb 100644
--- a/location/gps.6.1.xml.hk3
+++ b/location/gps.6.1.xml.hk3
@@ -101,6 +101,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.6.1.xml.sb3 b/location/gps.6.1.xml.sb3
index a848fd9..cf01e15 100644
--- a/location/gps.6.1.xml.sb3
+++ b/location/gps.6.1.xml.sb3
@@ -101,6 +101,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index b238f9b..1b2566e 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -99,6 +99,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 1abf8e2..1647b50 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -99,6 +99,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.6.1.xml.hk3 b/location/gps_user.6.1.xml.hk3
index a6ddbce..a1d9fde 100644
--- a/location/gps_user.6.1.xml.hk3
+++ b/location/gps_user.6.1.xml.hk3
@@ -99,6 +99,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.6.1.xml.sb3 b/location/gps_user.6.1.xml.sb3
index 4248a7b..6ee10ee 100644
--- a/location/gps_user.6.1.xml.sb3
+++ b/location/gps_user.6.1.xml.sb3
@@ -99,6 +99,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 292fa2b..b0f0218 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -97,6 +97,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index 3a0f045..38f7f47 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -97,6 +97,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index 463fd07..e065de1 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -97,6 +97,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

From e295a3ae54597a0e2e97fb0466d5c51e1566bd8b Mon Sep 17 00:00:00 2001
From: Hana Huang <hanahuang@google.com>
Date: Thu, 8 Aug 2024 14:03:19 +0000
Subject: [PATCH 2/2] Update estimated WiFi power consumption value

Bug: 351925447
Test: Wifi Regression Test
Flag: EXEMPT overlay update
Change-Id: I2b4badc92df027d366e9f3b21b6eb0c17022ad42
Signed-off-by: Hana Huang <hanahuang@google.com>
---
 .../frameworks/base/core/res/res/xml/power_profile.xml    | 8 ++++----
 .../frameworks/base/core/res/res/xml/power_profile.xml    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 5f36d8c..0680f65 100644
--- a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -188,11 +188,11 @@
     </array>
     <item name="gps.voltage">3700</item>
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">57</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">550</item>
     <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3700</item>
+    <item name="wifi.controller.voltage">3850</item>
 </device>
diff --git a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 5f36d8c..0680f65 100644
--- a/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -188,11 +188,11 @@
     </array>
     <item name="gps.voltage">3700</item>
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">57</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">550</item>
     <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3700</item>
+    <item name="wifi.controller.voltage">3850</item>
 </device>