Snap for 11578433 from 5852dd3125 to 24Q3-release

Change-Id: I13076cbcb69fee7a46393a5379c861b07824f3c1
This commit is contained in:
Android Build Coastguard Worker 2024-03-14 23:06:19 +00:00
commit 058260ac08
15 changed files with 35 additions and 17 deletions

View file

@ -291,7 +291,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.preferred_mode=960x2142@120:120
ifeq ($(filter factory_caiman, $(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.timeout_ns=500000000
endif

View file

@ -63,7 +63,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.preferred_mode=1008x2244@120:120
ifeq ($(filter factory_komodo, $(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.timeout_ns=500000000
endif
@ -391,3 +391,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
# ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif

View file

@ -361,3 +361,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
# ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif

View file

@ -27,3 +27,7 @@ include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/komodo/proprietary/BoardConfigVendor.mk
include device/google/caimito-sepolicy/komodo-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif

View file

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

View file

@ -12,7 +12,7 @@ uni_log_max_file_count=5
uni_log_max_size_mb=20
uni_log_total_max_size_mb=100
debug_enable=1
debug_enable=4
mem_dump_to_node=1
gnss_device_type=K042
@ -145,7 +145,7 @@ UseRtcForAiding=1
additional_rtc_uncertainty_ms=10
# 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.
# Used here to adjust the GPS week for carrier testing.

View file

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

View file

@ -12,7 +12,7 @@ uni_log_max_file_count=5
uni_log_max_size_mb=20
uni_log_total_max_size_mb=100
debug_enable=1
debug_enable=4
mem_dump_to_node=1
gnss_device_type=K042
@ -145,7 +145,7 @@ UseRtcForAiding=1
additional_rtc_uncertainty_ms=10
# 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.
# Used here to adjust the GPS week for carrier testing.

View file

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

View file

@ -12,7 +12,7 @@ uni_log_max_file_count=5
uni_log_max_size_mb=20
uni_log_total_max_size_mb=100
debug_enable=1
debug_enable=4
mem_dump_to_node=1
gnss_device_type=K042
@ -141,7 +141,7 @@ UseRtcForAiding=1
additional_rtc_uncertainty_ms=10
# 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.
# Used here to adjust the GPS week for carrier testing.

View file

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

View file

@ -12,7 +12,7 @@ uni_log_max_file_count=5
uni_log_max_size_mb=20
uni_log_total_max_size_mb=100
debug_enable=1
debug_enable=4
mem_dump_to_node=1
gnss_device_type=K042
@ -141,7 +141,7 @@ UseRtcForAiding=1
additional_rtc_uncertainty_ms=10
# 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.
# Used here to adjust the GPS week for carrier testing.

View file

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

View file

@ -12,7 +12,7 @@ uni_log_max_file_count=5
uni_log_max_size_mb=20
uni_log_total_max_size_mb=100
debug_enable=1
debug_enable=4
mem_dump_to_node=1
gnss_device_type=K042
@ -145,7 +145,7 @@ UseRtcForAiding=1
additional_rtc_uncertainty_ms=10
# 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.
# Used here to adjust the GPS week for carrier testing.

View file

@ -27,3 +27,7 @@ include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/tokay/proprietary/BoardConfigVendor.mk
include device/google/caimito-sepolicy/tokay-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif