From 65bdfe80d619bd6615ece890bf3fca907d9bca0a Mon Sep 17 00:00:00 2001
From: Lokesh Kumar Goel <lokeshgoel@google.com>
Date: Fri, 26 May 2023 19:25:25 +0000
Subject: [PATCH 1/2] Update pantah SVN to 24

Bug: 282371465
Change-Id: Ia10396ad2685465f2f3c3af9be2e7bdb14422e5c
---
 device-cheetah.mk | 2 +-
 device-panther.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-cheetah.mk b/device-cheetah.mk
index 1c654a9..0ec6e47 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -272,7 +272,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=23
+    ro.vendor.build.svn=24
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-panther.mk b/device-panther.mk
index 214b32d..1909173 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -257,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=23
+    ro.vendor.build.svn=24
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \

From b8aebb4f058539a2ca113a5fead4034c592f66e2 Mon Sep 17 00:00:00 2001
From: Suprabh Shukla <suprabh@google.com>
Date: Fri, 26 May 2023 13:11:51 -0700
Subject: [PATCH 2/2] Update Sound_trigger interrupt mapping

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

Bug: 284405919
Change-Id: If9bdc26b78a45a4a88ce1b515d898232def6fd17
---
 .../overlay/frameworks/base/core/res/res/xml/irq_device_map.xml | 2 +-
 .../overlay/frameworks/base/core/res/res/xml/irq_device_map.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 2a53b55..9b3e461 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -26,7 +26,7 @@
     <device name="cp2ap_wakeup">
         <subsystem>Cellular_data</subsystem>
     </device>
-    <device name="MAILBOX_AOCF12APxE00">
+    <device name="MAILBOX_AOCF12APx1100">
         <subsystem>Sound_trigger</subsystem>
     </device>
     <device name="MAILBOX_AOCA322APx100">
diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 2a53b55..9b3e461 100644
--- a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -26,7 +26,7 @@
     <device name="cp2ap_wakeup">
         <subsystem>Cellular_data</subsystem>
     </device>
-    <device name="MAILBOX_AOCF12APxE00">
+    <device name="MAILBOX_AOCF12APx1100">
         <subsystem>Sound_trigger</subsystem>
     </device>
     <device name="MAILBOX_AOCA322APx100">