Android 15.0.0 Release 20 (BP1A.250305.019)
-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8eo7QAKCRDorT+BmrEO eGUnAJ9bGTuagfRORqU1KMaMdPmYX0NATwCfYsrFcqQbnjw3mIyPzSFC1/qybTg= =2d7s -----END PGP SIGNATURE----- gpgsig -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ +rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQPSdBwYIRN4UutHtntG1wlwKUNS3SpR6YOFJMi7UZ5Vt6WjPtAa3YBCZr10ftnIIHK 2WnMwIKSFmF426Jvgxcgg= -----END SSH SIGNATURE----- Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20 Android 15.0.0 Release 20 (BP1A.250305.019) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8eo7QAKCRDorT+BmrEO # eGUnAJ9bGTuagfRORqU1KMaMdPmYX0NATwCfYsrFcqQbnjw3mIyPzSFC1/qybTg= # =2d7s # -----END PGP SIGNATURE----- # gpg: Signature made Wed Mar 5 03:29:17 2025 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate] # By Eileen Lai (2) and others # Via Android Build Coastguard Worker (11) and others * tag 'android-15.0.0_r20': modem_svc: use modem_svc_sit version sepolicy Add PLAYVIDEOS_VERSION_DIR and PRODUCT_SOONG_NAMESPACES for Videos. modem_svc: use shared_modem_platform to replace all modem_svc_sit raviole: Pull init.insmod.*.cfg from vendor_dlkm Move modem_svc_sit from gs101 to raviole Remove vibrator HAL service audio: enable software encoded Bluetooth broadcast gps: set default SUPL SSL method to SSLv23 Change-Id: Ia8a6344945e143e7d357e4644482cdca4593af00
This commit is contained in:
commit
31936a905e
9 changed files with 73 additions and 20 deletions
|
@ -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>
|
|
@ -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>
|
|
@ -32,7 +32,7 @@ on boot && property:ro.build.type=eng && \
|
|||
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
|
||||
|
|
|
@ -16,7 +16,7 @@ on early-boot
|
|||
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
|
||||
|
|
|
@ -14,7 +14,7 @@ on early-boot
|
|||
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
|
||||
|
|
|
@ -43,7 +43,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
|
|||
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 += \
|
|||
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 @@ PRODUCT_PACKAGES += \
|
|||
android.hardware.nfc-service.st \
|
||||
NfcOverlayOriole
|
||||
|
||||
# Shared Modem Platform
|
||||
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||
|
||||
# Shared Modem Platform
|
||||
include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.secure_element@1.2-service-gto \
|
||||
|
@ -355,3 +364,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
|||
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||
endif
|
||||
endif
|
||||
|
||||
# PlayVideos
|
||||
PLAYVIDEOS_VERSION_DIR := 4.20.6
|
||||
$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)
|
||||
|
|
|
@ -60,8 +60,6 @@ ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
|
|||
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 += \
|
|||
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 @@ PRODUCT_PACKAGES += \
|
|||
android.hardware.nfc-service.st \
|
||||
NfcOverlayRaven
|
||||
|
||||
# Shared Modem Platform
|
||||
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||
|
||||
# Shared Modem Platform
|
||||
include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.secure_element@1.2-service-gto \
|
||||
|
@ -365,3 +373,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
|||
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||
endif
|
||||
endif
|
||||
|
||||
# PlayVideos
|
||||
PLAYVIDEOS_VERSION_DIR := 4.20.6
|
||||
$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)
|
||||
|
|
|
@ -31,7 +31,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay
|
|||
|
||||
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 += \
|
|||
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 @@ PRODUCT_PACKAGES += \
|
|||
Tag \
|
||||
android.hardware.nfc-service.st
|
||||
|
||||
# Shared Modem Platform
|
||||
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||
|
||||
# Shared Modem Platform
|
||||
include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
|
||||
|
||||
# SecureElement
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.secure_element@1.2-service-gto
|
||||
|
|
|
@ -30,7 +30,6 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/whit
|
|||
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 += \
|
|||
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 @@ PRODUCT_PACKAGES += \
|
|||
Tag \
|
||||
android.hardware.nfc-service.st
|
||||
|
||||
# Shared Modem Platform
|
||||
SHARED_MODEM_PLATFORM_VENDOR := lassen
|
||||
|
||||
# Shared Modem Platform
|
||||
include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
|
||||
|
||||
# PowerStats HAL
|
||||
PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue