From 29348397c7617f57aa08f4e603b005777581d9b1 Mon Sep 17 00:00:00 2001
From: sashwinbalaji <sashwinbalaji@google.com>
Date: Tue, 21 Feb 2023 09:43:20 +0800
Subject: [PATCH 1/3] thermal: Update config for stats

Bug: 259903201
Test: local build and verify stats
Change-Id: I78182ce4952bc906dcb1bafac684ecf77f4280a4
---
 thermal_info_config_tangorpro.json | 38 +++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json
index c36ab5e..72e380a 100644
--- a/thermal_info_config_tangorpro.json
+++ b/thermal_info_config_tangorpro.json
@@ -729,5 +729,41 @@
             "PowerSampleDelay":7000,
             "PowerSampleCount":1
         }
-    ]
+    ],
+    "Stats": {
+        "Sensors": {
+            "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"],
+            "RecordWithThreshold": [
+                {
+                    "Name": "VIRTUAL-FRONT-SOC",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-FRONT-BL",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-BACK-SOC",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-BACK-CHARGER",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-USB-THROTTLING",
+                    "Thresholds": [1.0]
+                }
+            ]
+        },
+        "CoolingDevices": {
+            "RecordVotePerSensor": {
+                "DefaultThresholdEnableAll": true
+            }
+        }
+    }
 }

From 92518b16eafec9b50de0b1b67c913e50785007e6 Mon Sep 17 00:00:00 2001
From: Shuibing Dai <shuibing@google.com>
Date: Tue, 2 May 2023 13:46:27 -0700
Subject: [PATCH 2/3] Remove overlay item: country code update during setup
 wizard

The country code updating from scan results generic case can cover setup wizard case.

Bug: 279625751
Test: manually verified generic case
Change-Id: I91815abfb4ec9e6c2bc324c9bf3eb6ffee7d6cab
---
 rro_overlays/WifiOverlay/res/values/config.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 221b9e3..497a962 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -125,11 +125,6 @@
          2: verbose logging on by default for all builds -->
     <integer translatable="false" name="config_wifiVerboseLoggingAlwaysOnLevel">1</integer>
 
-    <!-- Boolean indicating whether the framework updates country from scan results when there is
-         no telephony country code and driver country code is 00.
-         This is applied only during the setup wizard -->
-    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
-
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>

From 79dca2073b496bcaf028eb5ec43bdb1751acba6c Mon Sep 17 00:00:00 2001
From: Suprabh Shukla <suprabh@google.com>
Date: Tue, 2 May 2023 16:48:51 -0700
Subject: [PATCH 3/3] Add wakeup interrupt mapping

Test: Manually inspect the output of:
`dumpsys batterystats --wakeups`

Bug: 271922941
Change-Id: Ie0bdef180adfa624afa8159df6fbb4654c87807a
---
 .../base/core/res/res/xml/irq_device_map.xml  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
new file mode 100644
index 0000000..89a5c33
--- /dev/null
+++ b/tangorpro/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2023, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License")
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<irq-device-map>
+    <device name="rtc-alarm0">
+        <subsystem>Alarm</subsystem>
+    </device>
+    <device name="dhdpcie_host_wake">
+        <subsystem>Wifi</subsystem>
+    </device>
+    <device name="MAILBOX_AOCA322APx100">
+        <subsystem>Sensor</subsystem>
+    </device>
+</irq-device-map>
+