[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 6fd951fa78 -s ours
am skip reason: Merged-In Ic78e619a04bcdaa767a2236f9a04fbe1d240a6c4 with SHA-1 ccf5dc11ce is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/30283753
Change-Id: I4187f9b147dae57817a974affa642c6d33230a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index e3f27d9..efd7277 100644
--- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<!-- Le Audio Audio Ports -->
+ <mixPort name="le audio broadcast output" role="source" />
<mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000"
@@ -51,6 +52,7 @@
<devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
<devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
<devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+ <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
</devicePorts>
<routes>
<route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
<route type="mix" sink="le audio input"
sources="BLE Headset In"/>
<route type="mix" sink="BLE Speaker Out"
- sources="le audio output"/>
+ sources="le audio output"/>
+ <route type="mix" sink="BLE Broadcast Out"
+ sources="le audio broadcast output"/>
</routes>
-</module>
+</module>
\ No newline at end of file
diff --git a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index e3f27d9..efd7277 100644
--- a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<!-- Le Audio Audio Ports -->
+ <mixPort name="le audio broadcast output" role="source" />
<mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000"
@@ -51,6 +52,7 @@
<devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
<devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
<devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+ <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
</devicePorts>
<routes>
<route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
<route type="mix" sink="le audio input"
sources="BLE Headset In"/>
<route type="mix" sink="BLE Speaker Out"
- sources="le audio output"/>
+ sources="le audio output"/>
+ <route type="mix" sink="BLE Broadcast Out"
+ sources="le audio broadcast output"/>
</routes>
-</module>
+</module>
\ No newline at end of file
diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index a09cbae..f70546d 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -32,7 +32,7 @@
property:persist.vendor.fingerprint.disable.fake.override=100
setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}
-service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+service insmod_sh_raviole /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg
class main
user root
group root system
diff --git a/conf/init.slider.rc b/conf/init.slider.rc
index 49c20ea..db78b71 100644
--- a/conf/init.slider.rc
+++ b/conf/init.slider.rc
@@ -16,7 +16,7 @@
start insmod_sh_slider
-service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg
+service insmod_sh_slider /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.slider.cfg
class main
user root
group root system
diff --git a/conf/init.whitefin.rc b/conf/init.whitefin.rc
index 8894c75..b492fdd 100644
--- a/conf/init.whitefin.rc
+++ b/conf/init.whitefin.rc
@@ -14,7 +14,7 @@
wait_for_prop vendor.common.modules.ready 1
start insmod_sh_whitefin
-service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg
+service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.whitefin.cfg
class main
user root
group root system
diff --git a/device-oriole.mk b/device-oriole.mk
index 95cc084..b38f140 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -43,7 +43,6 @@
include device/google/raviole/audio/oriole/audio-tables.mk
include device/google/gs101/device-shipping-common.mk
include device/google/gs101/telephony/pktrouter.mk
-include hardware/google/pixel/vibrator/cs40l25/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/stm/stm11.mk
@@ -70,9 +69,13 @@
PRODUCT_COPY_FILES += \
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.rc
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
PRODUCT_COPY_FILES += \
- device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.oriole.cfg
+ device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.oriole.cfg
+endif
# Thermal Config
PRODUCT_COPY_FILES += \
@@ -156,6 +159,12 @@
android.hardware.nfc-service.st \
NfcOverlayOriole
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+
# SecureElement
PRODUCT_PACKAGES += \
android.hardware.secure_element@1.2-service-gto \
diff --git a/device-raven.mk b/device-raven.mk
index 4ceb39e..49ff1e0 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -60,8 +60,6 @@
include device/google/raviole/uwb/uwb_calibration.mk
endif
-include hardware/google/pixel/vibrator/cs40l25/device.mk
-
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,raven)
$(call soong_config_set,lyric,tuning_product,raven)
@@ -79,9 +77,13 @@
PRODUCT_COPY_FILES += \
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.raven.rc
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
PRODUCT_COPY_FILES += \
- device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.raven.cfg
+ device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.raven.cfg
+endif
# Thermal Config
PRODUCT_COPY_FILES += \
@@ -162,6 +164,12 @@
android.hardware.nfc-service.st \
NfcOverlayRaven
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+
# SecureElement
PRODUCT_PACKAGES += \
android.hardware.secure_element@1.2-service-gto \
diff --git a/device-slider.mk b/device-slider.mk
index 9a51f6f..f47ab65 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -31,7 +31,6 @@
include device/google/gs101/device-common.mk
include device/google/raviole/audio/slider/audio-tables.mk
-include hardware/google/pixel/vibrator/cs40l25/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/gps/brcm/cbd_gps.mk
include device/google/gs-common/touch/stm/stm11.mk
@@ -49,9 +48,13 @@
PRODUCT_COPY_FILES += \
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.slider.rc
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
PRODUCT_COPY_FILES += \
- device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.slider.cfg
+ device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.slider.cfg
+endif
# Thermal Config
PRODUCT_COPY_FILES += \
@@ -92,6 +95,12 @@
Tag \
android.hardware.nfc-service.st
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+
# SecureElement
PRODUCT_PACKAGES += \
android.hardware.secure_element@1.2-service-gto
diff --git a/device-whitefin.mk b/device-whitefin.mk
index c9be012..41a969c 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -30,7 +30,6 @@
DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay
include device/google/gs101/device-common.mk
-include hardware/google/pixel/vibrator/drv2624/device.mk
include device/google/raviole/audio/whitefin/audio-tables.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/gps/brcm/cbd_gps.mk
@@ -53,9 +52,13 @@
PRODUCT_COPY_FILES += \
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.whitefin.rc
-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
PRODUCT_COPY_FILES += \
- device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.whitefin.cfg
+ device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.whitefin.cfg
+endif
# Thermal Config
PRODUCT_COPY_FILES += \
@@ -88,6 +91,12 @@
Tag \
android.hardware.nfc-service.st
+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+
# PowerStats HAL
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole
index f442e3a..df40156 100644
--- a/location/gps.6.1.xml.oriole
+++ b/location/gps.6.1.xml.oriole
@@ -18,7 +18,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven
index 3726311..c831068 100644
--- a/location/gps.6.1.xml.raven
+++ b/location/gps.6.1.xml.raven
@@ -18,7 +18,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps.xml b/location/gps.xml
index 76eb81e..009aaec 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -18,7 +18,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index 2f191d6..4833857 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -18,7 +18,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index 3ddfe1c..d663ebf 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -18,7 +18,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole
index ccea80d..0582009 100644
--- a/location/gps_user.6.1.xml.oriole
+++ b/location/gps_user.6.1.xml.oriole
@@ -17,7 +17,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven
index 2230ace..c276c11 100644
--- a/location/gps_user.6.1.xml.raven
+++ b/location/gps_user.6.1.xml.raven
@@ -17,7 +17,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 405b8b6..008efb0 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -17,7 +17,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole
index f935676..ec8d881 100644
--- a/location/gps_user.xml.oriole
+++ b/location/gps_user.xml.oriole
@@ -17,7 +17,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven
index ff3c5e2..3489a66 100644
--- a/location/gps_user.xml.raven
+++ b/location/gps_user.xml.raven
@@ -17,7 +17,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
- SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"