From f350357cbd75ca0b1f60e4f2018e3073355cc823 Mon Sep 17 00:00:00 2001
From: Nathan Kulczak <nathankulczak@google.com>
Date: Thu, 27 Apr 2023 18:19:45 +0000
Subject: [PATCH 1/3] [DO NOT MERGE] vibrator: Disable PWLE capability for U

Set chirp.enabled=0 so that CAP_FREQUENCY_CONTROL and
CAP_COMPOSE_PWLE_EFFECTS will not be enabled.

Bug: 275032416
Test: adb shell idlcli vibrator getCapabilities
Change-Id: I4eb07c595bbd15e85bf8c07e29cab1a479589b09
Signed-off-by: Nathan Kulczak <nathankulczak@google.com>
---
 device-husky.mk      | 2 +-
 device-ripcurrent.mk | 2 +-
 device-shiba.mk      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device-husky.mk b/device-husky.mk
index 8387c53..f5c64d4 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -287,7 +287,7 @@ PRODUCT_COPY_FILES += \
 # Vibrator HAL
 ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.vibrator.hal.chirp.enabled=1 \
+    ro.vendor.vibrator.hal.chirp.enabled=0 \
     ro.vendor.vibrator.hal.device.mass=0.222 \
     ro.vendor.vibrator.hal.loc.coeff=2.8
 
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 47c5ef2..8abc103 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -240,7 +240,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Vibrator HAL
 ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.vibrator.hal.chirp.enabled=1 \
+    ro.vendor.vibrator.hal.chirp.enabled=0 \
     ro.vendor.vibrator.hal.device.mass=0.222 \
     ro.vendor.vibrator.hal.loc.coeff=2.8
 
diff --git a/device-shiba.mk b/device-shiba.mk
index 048de6d..9a6cd00 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -265,7 +265,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 # Vibrator HAL
 ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.vibrator.hal.chirp.enabled=1 \
+    ro.vendor.vibrator.hal.chirp.enabled=0 \
     ro.vendor.vibrator.hal.device.mass=0.187 \
     ro.vendor.vibrator.hal.loc.coeff=2.75
 

From c4ce10285b0dd8c54c859aa81806401cbd252170 Mon Sep 17 00:00:00 2001
From: Shuibing Dai <shuibing@google.com>
Date: Tue, 2 May 2023 14:04:11 -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: Ic61530c4d3a6fe91c3bec3f2cf34f47dbc61bd16
---
 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 f46ac82..aeb75c0 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -157,11 +157,6 @@
          for SAP, WFD GO, Wi-Fi Aware -->
     <bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool>
 
-    <!-- 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 b41a804290bf848940a6fa1fd138e9d45c64cae1 Mon Sep 17 00:00:00 2001
From: Suprabh Shukla <suprabh@google.com>
Date: Wed, 3 May 2023 20:59:20 +0000
Subject: [PATCH 3/3] Add wakeup interrupt mappings for shusky

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

Bug: 271922941
Change-Id: I9708b79021c1e2a5fe066a8b66820ca28c899ea4
---
 .../base/core/res/res/xml/irq_device_map.xml  | 32 +++++++++++++++++++
 .../base/core/res/res/xml/irq_device_map.xml  | 32 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
 create mode 100644 shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml

diff --git a/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
new file mode 100644
index 0000000..99cd94f
--- /dev/null
+++ b/husky/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -0,0 +1,32 @@
+<?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="cp2ap_wakeup">
+        <subsystem>Cellular_data</subsystem>
+    </device>
+    <device name="MAILBOX_AOCA322APx100">
+        <subsystem>Sensor</subsystem>
+    </device>
+</irq-device-map>
diff --git a/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
new file mode 100644
index 0000000..99cd94f
--- /dev/null
+++ b/shiba/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -0,0 +1,32 @@
+<?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="cp2ap_wakeup">
+        <subsystem>Cellular_data</subsystem>
+    </device>
+    <device name="MAILBOX_AOCA322APx100">
+        <subsystem>Sensor</subsystem>
+    </device>
+</irq-device-map>