Snap for 11859356 from 3f0e868416 to 24Q3-release

Change-Id: Idced54c0bc75c6b5cac5eb48e159ffae0eff8282
This commit is contained in:
Android Build Coastguard Worker 2024-05-18 03:01:46 +00:00
commit d2dacfa312
6 changed files with 38 additions and 15 deletions

View file

@ -451,10 +451,6 @@ PRODUCT_COPY_FILES += \
# Support RIL Domain-selection # Support RIL Domain-selection
SUPPORT_RIL_DOMAIN_SELECTION := true SUPPORT_RIL_DOMAIN_SELECTION := true
# Thread HAL
PRODUCT_PACKAGES += \
com.google.comet.hardware.threadnetwork
# ETM # ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)

View file

@ -35,6 +35,7 @@ navicUsedInUSPolicy=2
Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DVS = 1
Chip_Configuration_FeatureCfg_DFS = 1 Chip_Configuration_FeatureCfg_DFS = 1
Chip_Configuration_FeatureCfg_MTPL = 0 Chip_Configuration_FeatureCfg_MTPL = 0
Chip_Configuration_FeatureCfg_SDL_BYASS = 1
mailboxDisabled=0x0 mailboxDisabled=0x0
gnss_rfic_chip_id=55400000 gnss_rfic_chip_id=55400000
UseRtcForAiding=1 UseRtcForAiding=1

View file

@ -125,6 +125,8 @@ Chip_Configuration_FeatureCfg_DVS = 1
Chip_Configuration_FeatureCfg_DFS = 1 Chip_Configuration_FeatureCfg_DFS = 1
# Disable MTPL # Disable MTPL
Chip_Configuration_FeatureCfg_MTPL = 0 Chip_Configuration_FeatureCfg_MTPL = 0
# MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start)
Chip_Configuration_FeatureCfg_SDL_BYASS = 1
# 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

View file

@ -123,18 +123,21 @@
"Type": "UNKNOWN", "Type": "UNKNOWN",
"VirtualSensor": true, "VirtualSensor": true,
"Formula": "COUNT_THRESHOLD", "Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["WLC_CHECK"], "Combination": ["WLC_CHECK"],
"Coefficient": [2], "Coefficient": [2],
"Multiplier": 1 "Multiplier": 1,
"PassiveDelay": 7000
}, },
{ {
"Name": "NO_WLC", "Name": "NO_WLC",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"Hidden": true, "Hidden": true,
"VirtualSensor": true, "VirtualSensor": true,
"Formula": "COUNT_THRESHOLD", "Formula": "WEIGHTED_AVG",
"Combination": ["WLC_CHECK"], "Combination": ["1", "IS_WLC"],
"Coefficient": [-2], "CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1 "Multiplier": 1
}, },
{ {
@ -231,7 +234,7 @@
"Version": "2.0", "Version": "2.0",
"VirtualSensor": true, "VirtualSensor": true,
"TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
"Formula": "MAXIMUM", "Formula": "WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"], "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"],
"Coefficient":["IS_WLC", "NO_WLC"], "Coefficient":["IS_WLC", "NO_WLC"],
"CoefficientType": ["SENSOR", "SENSOR"], "CoefficientType": ["SENSOR", "SENSOR"],

View file

@ -676,11 +676,28 @@
{ {
"Name": "VIRTUAL-SKIN-OUTER-DISPLAY", "Name": "VIRTUAL-SKIN-OUTER-DISPLAY",
"Type": "DISPLAY", "Type": "DISPLAY",
"Version": "2.0",
"VirtualSensor": true,
"TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
"Formula": "MAXIMUM",
"Combination": ["display_therm"],
"Coefficient": [0.956],
"Offset": 1102,
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,
"SendCallback": true,
"PollingDelay": 300000,
"PassiveDelay": 7000
},
{
"Name": "VIRTUAL-SKIN-INNER-DISPLAY",
"Type": "DISPLAY",
"Version": "1.0", "Version": "1.0",
"VirtualSensor": true, "VirtualSensor": true,
"TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
"Formula": "MAXIMUM", "Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"], "Combination": ["VIRTUAL-SKIN-OPEN"],
"Coefficient": [1.0], "Coefficient": [1.0],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
@ -709,18 +726,21 @@
"Type": "UNKNOWN", "Type": "UNKNOWN",
"VirtualSensor": true, "VirtualSensor": true,
"Formula": "COUNT_THRESHOLD", "Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["WLC_CHECK"], "Combination": ["WLC_CHECK"],
"Coefficient": [2], "Coefficient": [2],
"Multiplier": 1 "Multiplier": 1,
"PassiveDelay": 7000
}, },
{ {
"Name": "NO_WLC", "Name": "NO_WLC",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"Hidden": true, "Hidden": true,
"VirtualSensor": true, "VirtualSensor": true,
"Formula": "COUNT_THRESHOLD", "Formula": "WEIGHTED_AVG",
"Combination": ["WLC_CHECK"], "Combination": ["1", "IS_WLC"],
"Coefficient": [-2], "CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1 "Multiplier": 1
}, },
{ {
@ -817,7 +837,7 @@
"Version": "2.0", "Version": "2.0",
"VirtualSensor": true, "VirtualSensor": true,
"TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
"Formula": "MAXIMUM", "Formula": "WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"], "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"],
"Coefficient":["IS_WLC", "NO_WLC"], "Coefficient":["IS_WLC", "NO_WLC"],
"CoefficientType": ["SENSOR", "SENSOR"], "CoefficientType": ["SENSOR", "SENSOR"],
@ -902,6 +922,7 @@
"HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"Multiplier": 0.001, "Multiplier": 0.001,
"StepRatio": 0.4,
"PollingDelay": 300000, "PollingDelay": 300000,
"PassiveDelay": 7000, "PassiveDelay": 7000,
"SendCallback": true "SendCallback": true