Snap for 12462067 from 117b1153bc to mainline-tzdata6-release

Change-Id: Icef02695be2d4b7e4d6661b3d07cfe788d715f8e
This commit is contained in:
Android Build Coastguard Worker 2024-10-07 08:57:41 +00:00
commit 1d1c9f155a
9 changed files with 37 additions and 32 deletions

View file

@ -30,8 +30,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay
include device/google/lynx/audio/lynx/audio-tables.mk
include device/google/gs201/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/touch/gti/gti.mk
include device/google/gs-common/touch/gti/predump_gti.mk
include device/google/gs-common/wlan/dump.mk
# go/lyric-soong-variables
@ -340,5 +339,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
ro.quick_start.device_id=lynx
# Bluetooth device id
# Raven: 0x410B
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20491
bluetooth.device_id.product_id=16651
# 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

View file

@ -18,7 +18,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
@ -49,6 +49,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@ -56,6 +57,7 @@
AttributionAppPkgName="com.google.android.carrierlocation"
AssertEnabled="true"
ExitOnComFailure="true"
CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true"
CpLppHighAccuracyShapeMode="1"
@ -95,6 +97,8 @@
/>
<gll_features
EnableQzsAutoSwitch="false"
EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
/>

View file

@ -18,7 +18,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
@ -49,6 +49,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@ -56,6 +57,7 @@
AttributionAppPkgName="com.google.android.carrierlocation"
AssertEnabled="true"
ExitOnComFailure="true"
CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true"
CpLppHighAccuracyShapeMode="1"
@ -95,7 +97,10 @@
/>
<gll_features
EnableQzsAutoSwitch="false"
EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
ConstellationAutoSwitchOffNavOnly="true"
/>
</glgps>

View file

@ -17,7 +17,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
@ -48,6 +48,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@ -94,6 +95,8 @@
/>
<gll_features
EnableQzsAutoSwitch="false"
EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
/>

View file

@ -17,7 +17,7 @@
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplSslMethod="SSLv23"
SuplEnable="true"
SuplUseApn="false"
SuplUseApnNI="true"
@ -48,6 +48,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@ -94,7 +95,10 @@
/>
<gll_features
EnableQzsAutoSwitch="false"
EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
ConstellationAutoSwitchOffNavOnly="true"
/>
</glgps>

View file

@ -40,6 +40,13 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
include device/google/lynx-sepolicy/lynx-sepolicy.mk
include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/BoardUserdebugModules.mk
endif
endif

View file

@ -48,15 +48,6 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
<version>4.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>

View file

@ -9,20 +9,17 @@
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@ -30,7 +27,6 @@
{
"Name":"usb_pwr_therm2",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
"Multiplier":0.001
},
{
@ -38,7 +34,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@ -46,19 +41,16 @@
{
"Name":"skin_therm2",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp",
"Multiplier":0.001
},
{
"Name":"disp_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{

View file

@ -9,20 +9,17 @@
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 40.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@ -30,7 +27,6 @@
{
"Name":"usb_pwr_therm2",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp",
"Multiplier":0.001
},
{
@ -38,7 +34,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", 27.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/skin_therm1/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@ -46,19 +41,16 @@
{
"Name":"skin_therm2",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/skin_therm2/tz_temp",
"Multiplier":0.001
},
{
"Name":"disp_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001
},
{