Android 15.0.0 Release 20 (BP1A.250305.019)
-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8eo5wAKCRDorT+BmrEO eNXvAJ9be2FnzHtpE/9vG07escD01T7RfgCgkREHElral50a0CbF6eyhR17Mf5M= =ymht -----END PGP SIGNATURE----- gpgsig -----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgPpdpjxPACTIhnlvYz0GM4BR7FJ +rYv3jMbfxNKD3JvcAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQOdG9Rh6YGak2shDPSgDDqwsrzmBZlkWhPlymxs2FT7oltpN8j/wBuQfjx50HSlbS3 OoG7IraZ7YUwv4J2gc2Q8= -----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+BmrEOeAUCZ8eo5wAKCRDorT+BmrEO # eNXvAJ9be2FnzHtpE/9vG07escD01T7RfgCgkREHElral50a0CbF6eyhR17Mf5M= # =ymht # -----END PGP SIGNATURE----- # gpg: Signature made Wed Mar 5 03:29:11 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 Update ISODEP routing setting modem_svc: use shared_modem_platform to replace all modem_svc_sit bluejay: Pull init.insmod.*.cfg from vendor_dlkm Move modem_svc_sit from gs101 to bluejay Remove vibrator HAL service powerhint: fix json syntax for wbs test gps: set default SUPL SSL method to SSLv23 Change-Id: I788fc2ae76912b77452f2cf0f67ee4f01f56354f
This commit is contained in:
commit
6ccb849ca6
4 changed files with 15 additions and 6 deletions
|
@ -17,7 +17,7 @@ on early-boot
|
|||
wait_for_prop vendor.common.modules.ready 1
|
||||
start insmod_sh_blueport
|
||||
|
||||
service insmod_sh_blueport /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
|
||||
service insmod_sh_blueport /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg
|
||||
class main
|
||||
user root
|
||||
group root system
|
||||
|
|
|
@ -36,7 +36,6 @@ include device/google/bluejay/sepolicy/bluejay-sepolicy.mk
|
|||
include device/google/bluejay/audio/bluejay/audio-tables.mk
|
||||
include device/google/gs101/device-shipping-common.mk
|
||||
include device/google/gs101/telephony/pktrouter.mk
|
||||
include hardware/google/pixel/vibrator/cs40l26/device.mk
|
||||
include device/google/gs-common/bcmbt/bluetooth.mk
|
||||
include device/google/gs-common/touch/stm/stm11.mk
|
||||
|
||||
|
@ -63,9 +62,13 @@ PRODUCT_COPY_FILES += \
|
|||
PRODUCT_COPY_FILES += \
|
||||
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.bluejay.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/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.bluejay.cfg
|
||||
device/google/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.bluejay.cfg
|
||||
endif
|
||||
|
||||
# Thermal Config
|
||||
PRODUCT_COPY_FILES += \
|
||||
|
@ -111,6 +114,12 @@ PRODUCT_PACKAGES += \
|
|||
android.hardware.nfc-service.st \
|
||||
NfcOverlayBluejay
|
||||
|
||||
# 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
|
||||
|
|
|
@ -135,7 +135,7 @@ OFFHOST_ROUTE_ESE={86}
|
|||
# host 0x00
|
||||
# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE)
|
||||
# UICC 0x81 (UICC_1), 0x85 (UICC_2)
|
||||
DEFAULT_ISODEP_ROUTE=0x81
|
||||
DEFAULT_ISODEP_ROUTE=0x00
|
||||
|
||||
###############################################################################
|
||||
# Configure the HAL Clock control
|
||||
|
|
|
@ -328,7 +328,7 @@
|
|||
"Values": [
|
||||
"0",
|
||||
"1"
|
||||
],
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "LimitFlashCurrent",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue