Android 15.0.0 Release 6 (AP4A.241205.013)
-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO eKB7AJ4xhWb1iaPHIXgVBViPuCEWXDmBMgCfcMJCh44ID3rOg1tsC4cJvMHm9vM= =4qtT -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY8SAXHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmkdBRAAvM8tlvSGaEJDI5f0CO1vbk0z 8iieY6QkxBHqpTvrVYRXSOSaDskzaD//22iABqiejfXuRKlB6JvQisajwstGwGMi +yJkKrkiZLh6yE3ClSY3hbjw5VFtr5fsnreqTY/LpHAci/nPC/QG3QO6Zi3IYZE1 Wc/afEGLKVwxREFY8fGSzh4KSCSsxBBOP+4v1eenpF4RTy7+Rkak0aPqt9Dnwxb8 2Eg1NkkbFgPFLS6owJX4k1E0jzgpG7bZY/HaWI4ytpbHOasH37EKGtVJdnZt3zQx t30bS0j0XcxgvgpivG6PIpvmJujzuMHFA+LNMZ+Ory6SHxz7yUZxTOkRoK7ENjXF ujNcAKo2fWkzs3i6L4kIIlpF0dv3fVnWl5vH80uRqUWuRGFGti5KrHdkf7dBqrlg R42iod6dgfGWkd/x63dsLtBXM05y5eihL1aivzHg3l6GjZ3EMvhdmtjZz/kwfmL/ 7W3hE05xCc6fUKX7gDXQtSuLONd7R3M6ZVgATixAB4RoVP3qvrMRgi929G8m5OtW 2zopR65P3T926yBvOEPJRnD1k1dZJ1b1YMlIC4IL6tYWLgJw+BQOMdvSapOq9oOJ YeePZ52UQlEGdG5xzCfTp588hfrh83lKLraRpti95u7w21EKKApsk6Fl+lxnG50p uabQOexzdK7V0DfIFs4= =bat3 -----END PGP SIGNATURE----- Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 Android 15.0.0 Release 6 (AP4A.241205.013) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO # eKB7AJ4xhWb1iaPHIXgVBViPuCEWXDmBMgCfcMJCh44ID3rOg1tsC4cJvMHm9vM= # =4qtT # -----END PGP SIGNATURE----- # gpg: Signature made Fri Dec 6 00:44:01 2024 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2483 signatures in the past # 3 years. Encrypted 4 messages in the past 2 years. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Ankur Bakshi (6) and others # Via Android Build Coastguard Worker (31) and others * tag 'android-15.0.0_r6': (33 commits) gps: set default SUPL SSL method to SSLv23 gps: Enable Beidou measurements only in the US for P22. Symlink current prebuilt folder to android root Update product id for cheetah and panther cheetah/panther: add etm modules in userdebug/eng builds Disable limiting camera_hal for LAUNCH hint for A0 devices move bootloader and radio build flag to device mk Delete mapper4 manifest gps: Re-enable GLO & QZSS in US gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay thermal: read thermistor temp from sysfs thermal:remove unused state2power value Update panther SVN to 61 Update cheetah SVN to 61 thermal: Remove bcl related tzones update OWNERS to include Android.bp pantah: Add build_flags based properties for SMR/EMR build haptics: Update output distortion gain gps: Enable ExitOnComFailure Adpf:pantah: switch to multitier heuristic boost. ... Conflicts: cheetah/BoardConfig.mk device-cheetah.mk device-panther.mk panther/BoardConfig.mk Change-Id: Ia500f4b1ef963561699d96487fab25a07e341db9
This commit is contained in:
commit
11e966924f
36 changed files with 768 additions and 1352 deletions
|
@ -17,6 +17,19 @@
|
|||
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||
|
||||
ifdef RELEASE_GOOGLE_PANTHER_RADIO_DIR
|
||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
|
||||
endif
|
||||
RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)
|
||||
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR))
|
||||
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),)
|
||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
||||
else
|
||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR))
|
||||
endif
|
||||
|
||||
|
||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION)
|
||||
# Keeps flexibility for kasan and ufs builds
|
||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR)
|
||||
|
@ -192,7 +205,7 @@ PRODUCT_COPY_FILES += \
|
|||
|
||||
# LE Audio Unicast Allowlist
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
persist.bluetooth.leaudio.allow_list=SM-R510
|
||||
persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5
|
||||
|
||||
# Support LE & Classic concurrent encryption (b/330704060)
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
|
@ -285,15 +298,27 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
|||
|
||||
# Location
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
||||
device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
|
||||
ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
|
||||
device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
||||
device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
|
||||
device/google/pantah/location/gps.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
endif
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
||||
device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
|
||||
ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
|
||||
device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
|
||||
device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
|
||||
device/google/pantah/location/gps_user.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
|
||||
endif
|
||||
endif
|
||||
|
||||
# Set support one-handed mode
|
||||
|
@ -309,12 +334,30 @@ ifdef RELEASE_SVN_PANTHER
|
|||
TARGET_SVN ?= $(RELEASE_SVN_PANTHER)
|
||||
else
|
||||
# Set this for older releases that don't use build flag
|
||||
TARGET_SVN ?= 60
|
||||
TARGET_SVN ?= 61
|
||||
endif
|
||||
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.vendor.build.svn=$(TARGET_SVN)
|
||||
|
||||
# Set device family property for SMR
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.build.device_family=P10C10L10
|
||||
|
||||
# Set build properties for SMR builds
|
||||
ifeq ($(RELEASE_IS_SMR), true)
|
||||
ifneq (,$(RELEASE_BASE_OS_PANTHER))
|
||||
PRODUCT_BASE_OS := $(RELEASE_BASE_OS_PANTHER)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Set build properties for EMR builds
|
||||
ifeq ($(RELEASE_IS_EMR), true)
|
||||
ifneq (,$(RELEASE_BASE_OS_PANTHER))
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_PANTHER)
|
||||
endif
|
||||
endif
|
||||
# DCK properties based on target
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.gms.dck.eligible_wcc=2 \
|
||||
|
@ -361,6 +404,10 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
persist.vendor.vibrator.hal.context.cooldowntime=1600 \
|
||||
persist.vendor.vibrator.hal.context.settlingtime=5000
|
||||
|
||||
# Override Output Distortion Gain
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
vendor.audio.hapticgenerator.distortion.output.gain=0.38
|
||||
|
||||
# Keyboard bottom padding in dp for portrait mode and height ratio
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.com.google.ime.kb_pad_port_b=8 \
|
||||
|
@ -400,3 +447,15 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
ro.quick_start.oem_id=00e0 \
|
||||
ro.quick_start.device_id=panther
|
||||
|
||||
# Bluetooth device id
|
||||
# Panther: 0x4109
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
bluetooth.device_id.product_id=16649
|
||||
|
||||
# ETM
|
||||
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
|
||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||
endif
|
||||
endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue