Snap for 12462067 from 76640f8434
to mainline-tzdata6-release
Change-Id: Id27fb87224bffc0a1c693100d7c49ed9b48cde00
This commit is contained in:
commit
834cf774ce
9 changed files with 24 additions and 23 deletions
|
@ -43,6 +43,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
|
|||
include device/google/gs101/BoardConfig-common.mk
|
||||
include device/google/gs101/wifi/BoardConfig-wifi.mk
|
||||
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
|
||||
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
|
||||
-include vendor/google_devices/bluejay/proprietary/BoardConfigVendor.mk
|
||||
|
||||
$(call soong_config_set,google3a_config,target_device,bluejay)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
@ -309,5 +308,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
|
||||
|
||||
# Bluetooth device id
|
||||
# Bluejay: 0x4108
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
bluetooth.device_id.product_id=20488
|
||||
bluetooth.device_id.product_id=16648
|
||||
|
|
|
@ -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"
|
||||
ReAidingOnHotStart="false"
|
||||
|
@ -94,6 +96,8 @@
|
|||
/>
|
||||
|
||||
<gll_features
|
||||
EnableQzsAutoSwitch="false"
|
||||
EnableGloAutoSwitch="false"
|
||||
EnableNicAutoSwitch="true"
|
||||
/>
|
||||
|
||||
|
|
|
@ -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"
|
||||
ReAidingOnHotStart="false"
|
||||
|
@ -94,7 +96,10 @@
|
|||
/>
|
||||
|
||||
<gll_features
|
||||
EnableQzsAutoSwitch="false"
|
||||
EnableGloAutoSwitch="false"
|
||||
EnableNicAutoSwitch="true"
|
||||
ConstellationAutoSwitchOffNavOnly="true"
|
||||
/>
|
||||
|
||||
</glgps>
|
||||
|
|
|
@ -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"
|
||||
|
@ -93,6 +94,8 @@
|
|||
/>
|
||||
|
||||
<gll_features
|
||||
EnableQzsAutoSwitch="false"
|
||||
EnableGloAutoSwitch="false"
|
||||
EnableNicAutoSwitch="true"
|
||||
/>
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
@ -93,7 +94,10 @@
|
|||
/>
|
||||
|
||||
<gll_features
|
||||
EnableQzsAutoSwitch="false"
|
||||
EnableGloAutoSwitch="false"
|
||||
EnableNicAutoSwitch="true"
|
||||
ConstellationAutoSwitchOffNavOnly="true"
|
||||
/>
|
||||
|
||||
</glgps>
|
||||
|
|
|
@ -328,7 +328,7 @@
|
|||
"Values": [
|
||||
"0",
|
||||
"1"
|
||||
],
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name": "LimitFlashCurrent",
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
0.0,
|
||||
0.0
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001,
|
||||
"PollingDelay":60000,
|
||||
|
@ -39,7 +38,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -55,7 +53,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -71,7 +68,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -87,7 +83,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -112,7 +107,6 @@
|
|||
"0.0",
|
||||
"0.0"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -128,7 +122,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -144,7 +137,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
0.0,
|
||||
0.0
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001,
|
||||
"PollingDelay":60000,
|
||||
|
@ -39,7 +38,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -55,7 +53,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -71,7 +68,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -87,7 +83,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -112,7 +107,6 @@
|
|||
"0.0",
|
||||
"0.0"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -128,7 +122,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
@ -144,7 +137,6 @@
|
|||
"NAN",
|
||||
"NAN"
|
||||
],
|
||||
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
|
||||
"VrThreshold":"NAN",
|
||||
"Multiplier":0.001
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue