Snap for 11996381 from 999e3955f3 to 25D4-release

Change-Id: I188fc95b0ce98d57ff284213f49d8e7d6d2cb5a0
This commit is contained in:
Android Build Coastguard Worker 2024-06-20 23:04:24 +00:00
commit e422d37124
6 changed files with 57 additions and 81 deletions

View file

@ -69,7 +69,7 @@ sync from ag/26090783, need remove before submit.
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4000</point> <point>1,-4200</point>
<point>33,-2400</point> <point>33,-2400</point>
<point>66,-1200</point> <point>66,-1200</point>
<point>100,0</point> <point>100,0</point>
@ -83,30 +83,30 @@ sync from ag/26090783, need remove before submit.
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_MEDIA_VOLUME_CURVE"/> ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-6589</point> <point>1,-6799</point>
<point>8,-5971</point> <point>8,-6157</point>
<point>12,-5619</point> <point>12,-5810</point>
<point>16,-5212</point> <point>16,-5386</point>
<point>20,-4833</point> <point>20,-5014</point>
<point>24,-4434</point> <point>24,-4563</point>
<point>28,-4141</point> <point>28,-4251</point>
<point>32,-3856</point> <point>32,-3946</point>
<point>36,-3611</point> <point>36,-3724</point>
<point>40,-3382</point> <point>40,-3463</point>
<point>44,-3143</point> <point>44,-3193</point>
<point>48,-2921</point> <point>48,-2976</point>
<point>52,-2695</point> <point>52,-2743</point>
<point>56,-2497</point> <point>56,-2518</point>
<point>60,-2308</point> <point>60,-2354</point>
<point>64,-2109</point> <point>64,-2112</point>
<point>68,-1893</point> <point>68,-1912</point>
<point>72,-1706</point> <point>72,-1697</point>
<point>76,-1474</point> <point>76,-1467</point>
<point>80,-1224</point> <point>80,-1222</point>
<point>84,-1000</point> <point>84,-1010</point>
<point>88,-786</point> <point>88,-791</point>
<point>92,-581</point> <point>92,-550</point>
<point>96,-275</point> <point>96,-260</point>
<point>100,0</point> <point>100,0</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@ -132,7 +132,7 @@ sync from ag/26090783, need remove before submit.
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4800</point> <point>1,-5200</point>
<point>33,-2400</point> <point>33,-2400</point>
<point>66,-1200</point> <point>66,-1200</point>
<point>100,0</point> <point>100,0</point>
@ -190,10 +190,10 @@ sync from ag/26090783, need remove before submit.
<point>100,-1800</point> <point>100,-1800</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-6000</point> <point>1,-6200</point>
<point>33,-3000</point> <point>33,-3200</point>
<point>66,-2200</point> <point>66,-2400</point>
<point>100,-1600</point> <point>100,-1800</point>
</volume> </volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE" <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

View file

@ -269,6 +269,8 @@ PRODUCT_SOONG_NAMESPACES += \
# Location # Location
include device/google/tegu/location/device-gnss.mk include device/google/tegu/location/device-gnss.mk
# For GPS property
PRODUCT_VENDOR_PROPERTIES += ro.vendor.gps.pps.enabled=true
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true persist.device_config.configuration.disable_rescue_party=true
@ -295,7 +297,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.supported_primitives=243 \
ro.vendor.vibrator.hal.f0.comp.enabled=1 \ ro.vendor.vibrator.hal.f0.comp.enabled=1 \
ro.vendor.vibrator.hal.redc.comp.enabled=0 \ ro.vendor.vibrator.hal.redc.comp.enabled=0 \
persist.vendor.vibrator.hal.context.enable=false \ persist.vendor.vibrator.hal.context.enable=false \

View file

@ -24,6 +24,9 @@ gnss_device_type=K041
gnss_device_patch_address=0 gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin gnss_device_patch_file=/vendor/firmware/kepler.bin
# Enable/Disable 1PPS Time Sync policy
Is1PPSTimeSyncEnable=1
# send debug req on MCW oddity # send debug req on MCW oddity
#Chip_Configuration_Io_Options=0x85 #Chip_Configuration_Io_Options=0x85
@ -113,6 +116,8 @@ navicUsedInUSPolicy=2
# DFS: 0 = Disabled (default), 1 = Enabled # DFS: 0 = Disabled (default), 1 = Enabled
Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DVS = 1
Chip_Configuration_FeatureCfg_DFS = 1 Chip_Configuration_FeatureCfg_DFS = 1
# MTPL: 0 = Disabled, 1 = Enabled (default)
Chip_Configuration_FeatureCfg_MTPL=0
# This is a bitfield that will disable incoming interrupts for mailboxes # This is a bitfield that will disable incoming interrupts for mailboxes
# AP = 0x1 # AP = 0x1
@ -121,7 +126,7 @@ Chip_Configuration_FeatureCfg_DFS = 1
# CHUB = 0x8 # CHUB = 0x8
# The CHUB on the neus continually triggers a bit so this is to prevent # The CHUB on the neus continually triggers a bit so this is to prevent
# it from continually waking the gnss. # it from continually waking the gnss.
mailboxDisabled=0x8 mailboxDisabled=0x0
### Specify RFIC ID for K40 ### ### Specify RFIC ID for K40 ###
# 55200001 = S5520 EVT1 # 55200001 = S5520 EVT1

View file

@ -10,6 +10,7 @@ caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
gnss_device_type=K041 gnss_device_type=K041
gnss_device_patch_address=0 gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin gnss_device_patch_file=/vendor/firmware/kepler.bin
Is1PPSTimeSyncEnable=1
Chip_Configuration_Dynamic_HSI=0 Chip_Configuration_Dynamic_HSI=0
Chip_Configuration_ubsan_opt=1 Chip_Configuration_ubsan_opt=1
GlueLayer_IsPlatformRefTimeEnable=1 GlueLayer_IsPlatformRefTimeEnable=1
@ -36,7 +37,8 @@ qzssUsedInUSPolicy=2
navicUsedInUSPolicy=2 navicUsedInUSPolicy=2
Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DVS = 1
Chip_Configuration_FeatureCfg_DFS = 1 Chip_Configuration_FeatureCfg_DFS = 1
mailboxDisabled=0x8 Chip_Configuration_FeatureCfg_MTPL=0
mailboxDisabled=0x0
gnss_rfic_chip_id=55200001 gnss_rfic_chip_id=55200001
UseRtcForAiding=1 UseRtcForAiding=1
rtc_min_num_of_fixes=10 rtc_min_num_of_fixes=10

View file

@ -180,7 +180,6 @@
"Version":"2.0", "Version":"2.0",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"TriggerSensor": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"],
"Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"], "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"],
"Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0],
"Multiplier": 0.001 "Multiplier": 0.001
@ -680,50 +679,6 @@
"Multiplier":0.001, "Multiplier":0.001,
"SendCallback":true "SendCallback":true
}, },
{
"Name":"VIRTUAL-SKIN-FRONT-SUB-0",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
"Coefficient":[0.04, 0.03, 0.1, 0.05, 0.35, 0.3, 0, 0, 0.04],
"Offset":1850,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-FRONT-SUB-1",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
"Coefficient":[0, 0, 0.35, 0.22, 0.22, 0.07, 0.03, 0, 0],
"Offset":-560,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-FRONT-SUB-2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
"Coefficient":[0.05, 0.13, 0.12, 0.07, 0.37, 0.06, 0.01, 0.01, 0],
"Offset":5070,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-FRONT",
"Type":"UNKNOWN",
"Version":"1.0",
"VirtualSensor":true,
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"],
"Coefficient":[1, 1, 1],
"Multiplier":0.001
},
{ {
"Name": "VIRTUAL-SKIN-CHARGE-SUB-0", "Name": "VIRTUAL-SKIN-CHARGE-SUB-0",
"Type": "UNKNOWN", "Type": "UNKNOWN",
@ -867,10 +822,9 @@
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{ {
"Name":"VSKIN-SKIN-OVER-52", "Name":"VSKIN-SKIN-UNDER-52",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor": ["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[-52000], "Coefficient":[-52000],
@ -883,10 +837,24 @@
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000], "Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"], "CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "VSKIN-SKIN-OVER-52"], "Coefficient":[1, -1, "VSKIN-SKIN-UNDER-52"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"], "CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name": "STATS-UPDATOR",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "QUIET_THERM-MODEL-DIFF-DURING-MODEL-OVER-52", "VSKIN-SKIN-UNDER-52"],
"Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0],
"Multiplier": 1,
"SendPowerHint": true,
"PollingDelay": 300000,
"PassiveDelay": 7000
},
{ {
"Name":"LITTLE", "Name":"LITTLE",
"Type":"CPU", "Type":"CPU",