[automerger skipped] Merge TQ2A.230405.003 am: 53f33ec955 am: 138362d9c8 -s ours am: f9cd0d0755 -s ours am: 515a64757e -s ours am: c3c00946dc -s ours
am skip reason: Merged-In Ie698acacc96e7913d3b09523a558bc7d06d7277e with SHA-1 b1ed6bbd30 is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2530521
Change-Id: I3f4aa87b99fe70efe60bf6217b36895f588016d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index a8e538c..298b1d9 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -211,7 +211,8 @@
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
- ro.gms.dck.eligible_wcc=2
+ ro.gms.dck.eligible_wcc=2 \
+ ro.gms.dck.se_capability=1
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
diff --git a/device-raven.mk b/device-raven.mk
index 5325d5c..4550a0b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -221,7 +221,8 @@
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
- ro.gms.dck.eligible_wcc=3
+ ro.gms.dck.eligible_wcc=3 \
+ ro.gms.dck.se_capability=1
# SKU specific RROs
PRODUCT_PACKAGES += \
diff --git a/location/gps.xml b/location/gps.xml
index 8fb7c66..7c53415 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -35,6 +35,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index d85fd16..cd149a7 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -35,6 +35,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index a095dbd..3c6dbc6 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -35,6 +35,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 5efd542..baf0ee5 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -34,6 +34,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole
index 2d50372..558799d 100644
--- a/location/gps_user.xml.oriole
+++ b/location/gps_user.xml.oriole
@@ -34,6 +34,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven
index b2fb2bd..0861857 100644
--- a/location/gps_user.xml.raven
+++ b/location/gps_user.xml.raven
@@ -34,6 +34,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 35de830..cc046b2 100644
--- a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -23,5 +23,8 @@
<device name="dhdpcie_host_wake">
<subsystem>Wifi</subsystem>
</device>
+ <device name="MAILBOX_AOC2APxE00">
+ <subsystem>Sound_trigger</subsystem>
+ </device>
</irq-device-map>
diff --git a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
index 35de830..cc046b2 100644
--- a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
+++ b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml
@@ -23,5 +23,8 @@
<device name="dhdpcie_host_wake">
<subsystem>Wifi</subsystem>
</device>
+ <device name="MAILBOX_AOC2APxE00">
+ <subsystem>Sound_trigger</subsystem>
+ </device>
</irq-device-map>