From 40e7950a68642e5f7fb2d4b4c79a140d7dbe4b21 Mon Sep 17 00:00:00 2001
From: Lokesh Kumar Goel <lokeshgoel@google.com>
Date: Thu, 25 May 2023 18:20:11 +0000
Subject: [PATCH 1/2] Update lynx SVN to 8

Bug: 282371465
Change-Id: I247e1b42d7224cb9deec7da374654827bb2adc52
---
 device-lynx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-lynx.mk b/device-lynx.mk
index 929d465..8870ffe 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -199,7 +199,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=7
+    ro.vendor.build.svn=8
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \

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

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

Bug: 284405919
Change-Id: I23d49e39ae3d694a7131ed18fbf8a7b3ec6053c9
---
 .../overlay/frameworks/base/core/res/res/xml/irq_device_map.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lynx/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/lynx/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 5ac1f57..8304044 100644
--- a/lynx/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/lynx/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">