Snap for 11578433 from 4c117345c6 to 24Q3-release

Change-Id: Ic9b50e5dbbbdb4850f212d07fc7d9617d13d53ed
This commit is contained in:
Android Build Coastguard Worker 2024-03-14 23:06:24 +00:00
commit 12781ce0c6
4 changed files with 13 additions and 4 deletions

View file

@ -30,6 +30,10 @@ include device/google/zumapro/BoardConfig-common.mk
include device/google/comet-sepolicy/comet-sepolicy.mk include device/google/comet-sepolicy/comet-sepolicy.mk
include device/google/comet/wifi/BoardConfig-wifi.mk include device/google/comet/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif
else else
include device/google/comet23/comet23/BoardConfig.mk include device/google/comet23/comet23/BoardConfig.mk

View file

@ -74,7 +74,7 @@ PRODUCT_COPY_FILES += \
device/google/comet/comet/panel_config_google-ct3e_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-ct3e_cal1.pb device/google/comet/comet/panel_config_google-ct3e_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-ct3e_cal1.pb
ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),) ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),)
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1@202504:1.2@202404 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
endif endif
@ -393,3 +393,8 @@ SUPPORT_RIL_DOMAIN_SELECTION := true
# Thread HAL # Thread HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
com.google.comet.hardware.threadnetwork com.google.comet.hardware.threadnetwork
# ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif

View file

@ -34,7 +34,7 @@ mailboxDisabled=0x0
gnss_rfic_chip_id=55400000 gnss_rfic_chip_id=55400000
UseRtcForAiding=1 UseRtcForAiding=1
additional_rtc_uncertainty_ms=10 additional_rtc_uncertainty_ms=10
Sif_UseFwXtraInterface=0 Sif_UseFwXtraInterface=1
Agnss_IsGloAidingEnable=0 Agnss_IsGloAidingEnable=0
SETCaps_IsOtdoa=1 SETCaps_IsOtdoa=1
SETCaps_IsLpp=1 SETCaps_IsLpp=1

View file

@ -12,7 +12,7 @@ uni_log_max_file_count=5
uni_log_max_size_mb=20 uni_log_max_size_mb=20
uni_log_total_max_size_mb=100 uni_log_total_max_size_mb=100
debug_enable=1 debug_enable=4
mem_dump_to_node=1 mem_dump_to_node=1
gnss_device_type=K042 gnss_device_type=K042
@ -145,7 +145,7 @@ UseRtcForAiding=1
additional_rtc_uncertainty_ms=10 additional_rtc_uncertainty_ms=10
# set to 1 for FW SGEE download - Requires Android FW to be properly configured # set to 1 for FW SGEE download - Requires Android FW to be properly configured
Sif_UseFwXtraInterface=0 Sif_UseFwXtraInterface=1
# ChipCfg_GetGpsWeekFloor variable allows testing of old GPS weeks. # ChipCfg_GetGpsWeekFloor variable allows testing of old GPS weeks.
# Used here to adjust the GPS week for carrier testing. # Used here to adjust the GPS week for carrier testing.