Evolution-X-Tensor/device_google_comet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 13025264 from 8317c40a25 to mainline-tzdata6-release

Browse source 
Change-Id: I64ca9c549e5cc8d9179d3a8be1fdc79ff90c0ba7
This commit is contained in:
Android Build Coastguard Worker 2025-02-06 14:20:12 -08:00
commit 1e124db55d
10 changed files with 217 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

3
aosp_comet.mk
View file

@ -24,6 +24,3 @@ PRODUCT_DEVICE := comet
PRODUCT_MODEL := AOSP on comet
PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google
DEVICE_MANIFEST_FILE := \
device/google/comet/manifest.xml

5
comet/overlay/packages/services/Telephony/res/values/config.xml
View file

@ -25,6 +25,8 @@
Values should be ISO3166 country codes in lowercase. -->
<string-array name="config_countries_dynamic_routing_emergency_enabled"
translatable="false">
<!-- b/393518741 -->
<item>cz</item>
<item>in</item>
<item>il</item>
<item>tw</item>
@ -40,6 +42,9 @@
Values are the tuples of Country ISO, MNC, and numbers. -->
<string-array name="config_dynamic_routing_emergency_numbers"
translatable="false">
<!-- b/393518741 -->
<item>cz,01,156</item>
<item>cz,03,156</item>
<item>in,,101,102,103,108</item>
<item>il,,101,102</item>
<item>tw,,110,119</item>

8
device-comet.mk
View file

@ -197,6 +197,7 @@ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_backup_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_backup.json \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_speaker_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_speaker_estimation_model.tflite \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_lpm_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_lpm.json \
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
@ -343,7 +344,8 @@ PRODUCT_SOONG_NAMESPACES += \
# UWB Overlay
PRODUCT_PACKAGES += \
UwbOverlayCT3
UwbOverlayCT3 \
UwbOverlayCT3Gsi
# WiFi Overlay
PRODUCT_PACKAGES += \
@ -415,8 +417,6 @@ PRODUCT_VENDOR_PROPERTIES += \
# Haptics
# Placeholders for updates later, need to update:
# remove ro.vendor.vibrator.hal.dbc.enable (needed for setting pm.activetimeout)
# remove pm.activetimeout
# ro.vendor.vibrator.hal.loc.coeff.folded currently unused
$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
ACTUATOR_MODEL := luxshare_ict_081545
@ -426,8 +426,6 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.device.mass=0.2605 \
ro.vendor.vibrator.hal.loc.coeff.folded=3.15 \
ro.vendor.vibrator.hal.loc.coeff=2.58 \
ro.vendor.vibrator.hal.dbc.enable=1 \
ro.vendor.vibrator.hal.pm.activetimeout=5 \
persist.vendor.vibrator.hal.context.enable=false \
persist.vendor.vibrator.hal.context.scale=60 \
persist.vendor.vibrator.hal.context.fade=true \

7
location/user/gps.cfg
View file

@ -43,6 +43,9 @@ gnss_rfic_chip_id=55400000
UseRtcForAiding=1
additional_rtc_uncertainty_ms=10
Sif_UseFwXtraInterface=1
Agnss_IsGloAidingEnable=0
Agnss_IsGalAidingEnable=0
Agnss_IsBdsAidingEnable=0
SETCaps_IsOtdoa=1
SETCaps_IsLpp=1
SETCaps_SuplUT1=20
@ -159,10 +162,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3
GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0
ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0

7
location/userdebug/gps.cfg
View file

@ -189,6 +189,9 @@ Sif_UseFwXtraInterface=1
# The above sets the correct operation when the true week is between 1024 and 2048
# ChipCfg_GetGpsWeekFloor=0
Agnss_IsGloAidingEnable=0
Agnss_IsGalAidingEnable=0
Agnss_IsBdsAidingEnable=0
SETCaps_IsOtdoa=1
SETCaps_IsLpp=1
SETCaps_SuplUT1=20
@ -332,10 +335,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3
# KDDI
GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0
ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
# SBM
GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0

116
manifest.xml
View file

@ -1,116 +0,0 @@
<manifest version="1.0" type="device" target-level="5">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
<version>7.1</version>
<interface>
<name>IDevicesFactory</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport>hwbinder</transport>
<version>7.0</version>
<interface>
<name>IEffectsFactory</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.soundtrigger</name>
<transport>hwbinder</transport>
<version>2.3</version>
<interface>
<name>ISoundTriggerHw</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.media.omx</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IOmx</name>
<instance>default</instance>
</interface>
<interface>
<name>IOmxStore</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.allocator</name>
<transport>hwbinder</transport>
<version>4.0</version>
<interface>
<name>IAllocator</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>
<version>2.4</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.renderscript</name>
<transport arch="32+64">passthrough</transport>
<version>1.0</version>
<interface>
<name>IDevice</name>
<instance>default</instance>
</interface>
</hal>
<hal format = "hidl">
<name>android.hardware.dumpstate</name>
<transport>hwbinder</transport>
<version>1.1</version>
<interface>
<name>IDumpstateDevice</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.bluetooth.audio</name>
<transport>hwbinder</transport>
<version>2.1</version>
<interface>
<name>IBluetoothAudioProvidersFactory</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.boot</name>
<transport>hwbinder</transport>
<fqname>@1.2::IBootControl/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<fqname>@1.3::IDevice/google-edgetpu</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.health</name>
<transport>hwbinder</transport>
<version>2.1</version>
<interface>
<name>IHealth</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<transport>hwbinder</transport>
<version>3.0</version>
<interface>
<name>IAudioExt</name>
<instance>default</instance>
</interface>
</hal>
<kernel target-level="6"/>
</manifest>

167
powerhint-comet.json
View file

@ -888,6 +888,26 @@
"ResetOnInit": true,
"Type": "Property"
},
{
"Name": "ntc_critical_trip",
"Path": "/dev/thermal/tz-by-name/charger_therm/trip_point_1_temp",
"Values": [
"64000",
"72000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "ntc_hot_trip",
"Path": "/dev/thermal/tz-by-name/charger_therm/trip_point_2_temp",
"Values": [
"66000",
"74000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@ -993,6 +1013,16 @@
"WriteOnly": true,
"ResetOnInit": false
},
{
"Name": "AAModeProperty",
"Path": "vendor.powerhal.mode.aa",
"Values": [
"1",
"0"
],
"ResetOnInit": true,
"Type": "Property"
},
{
"Name": "KswapdUclaimMin",
"Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min",
@ -1011,6 +1041,16 @@
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "SYSTEM_UI_ADPF_PROFILES",
"Path": "<AdpfConfig>:SYSTEM_UI",
"Values": [
"SYSTEM_UI_PROFILE"
],
"DefaultIndex": 0,
"ResetOnInit": true,
"Type": "Event"
}
],
"Actions": [
@ -3203,6 +3243,12 @@
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "AUTOMOTIVE_PROJECTION",
"Node": "AAModeProperty",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle",
@ -3244,6 +3290,18 @@
"Duration": 0,
"Value": "170"
},
{
"PowerHint": "DISPLAY_IDLE",
"Type": "MaskHint",
"Value":"DISPLAY_UPDATE_IMMINENT",
"EnableProperty": "vendor.powerhal.mode.aa"
},
{
"PowerHint": "DISPLAY_IDLE",
"Type": "MaskHint",
"Value":"CPU_LOAD_RESET",
"EnableProperty": "vendor.powerhal.mode.aa"
},
{
"PowerHint": "DISPLAY_UPDATE_IMMINENT",
"Node": "CPULittleClusterDownRateLimitUs",
@ -3388,6 +3446,18 @@
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
"Node": "ntc_critical_trip",
"Duration": 0,
"Value": "72000"
},
{
"PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
"Node": "ntc_hot_trip",
"Duration": 0,
"Value": "74000"
},
{
"PowerHint": "GAME",
"Node": "PMU_POLL",
@ -3922,79 +3992,42 @@
"GpuCapacityBoostMax": 25000
},
{
"Name": "UiHighBoostWithoutPid",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"Name": "SYSTEM_UI_PROFILE",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 0.5,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,
"PID_I_Low": -30,
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 730,
"UclampMin_LoadReset": 730,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowBoostWithoutPid",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"ReportingRateLimitNs": 166666660,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowNoneBoost",
"PID_On": false,
"PID_Po": 0,
"PID_Pu": 0,
"PID_I": 0,
"PID_I_Init": 0,
"PID_I_High": 0,
"PID_I_Low": 0,
"PID_Do": 0,
"PID_Du": 0,
"SamplingWindow_P": 1,
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
"GpuBoost": false
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostModerateJankThreshold": 2,
"HBoostOffMaxAvgDurRatio": 4.0,
"HBoostSevereJankPidPu": 0.3,
"HBoostSevereJankThreshold": 8,
"HBoostUclampMinCeilingRange": [480, 722],
"HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000
}
]
}

10
rro_overlays/UwbOverlay/Android.bp
View file

@ -14,5 +14,13 @@ runtime_resource_overlay {
theme: "UwbOverlayCT3",
certificate: "platform",
sdk_version: "current",
product_specific: true
product_specific: true,
}
runtime_resource_overlay {
name: "UwbOverlayCT3Gsi",
theme: "UwbOverlayCT3",
certificate: "platform",
sdk_version: "current",
vendor: true,
}

5
thermal/thermal_info_config_comet.json
View file

@ -4,6 +4,11 @@
"Name": "battery",
"Type": "BATTERY",
"HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "60.0"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.9],
"SendCallback": true,
"TripPointIgnorable": true,
"PollingDelay": 60000,
"PassiveDelay": 60000,
"Multiplier": 0.001
},
{

81
thermal/thermal_info_config_lpm_comet.json Normal file
View file

@ -0,0 +1,81 @@
{
"Include": ["thermal_info_config.json"],
"Sensors":[
{
"Name":"SkinShutdownModeHighPower",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN", "PARTIAL_SYSTEM_POWER"],
"CombinationType":["SENSOR", "ODPM"],
"Coefficient":[57000.0, 1000.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 2.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.9],
"Multiplier":1
},
{
"Name":"BatteryShutdownModeHighPower",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["battery", "PARTIAL_SYSTEM_POWER"],
"CombinationType":["SENSOR", "ODPM"],
"Coefficient":[60000.0, 1000.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 2.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.9],
"Multiplier":1
},
{
"Name":"battery",
"Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 5.0, 1.9],
"SeverityReference": "BatteryShutdownModeHighPower",
"SendCallback": true,
"TripPointIgnorable": true,
"PollingDelay": 60000,
"PassiveDelay": 60000,
"Multiplier":0.001
},
{
"Name":"ShutdownMode",
"Type":"UNKNOWN",
"VirtualSensor":true,
"TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
"Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 57.0, "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 5.9, 1.9],
"SeverityReference": "battery",
"Multiplier":0.001,
"SendCallback": true,
"SendPowerHint": true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name": "VIRTUAL-SKIN",
"Type": "SKIN",
"Version": "2.3",
"VirtualSensor": true,
"TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 65.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"SeverityReference": "SkinShutdownModeHighPower",
"Multiplier": 0.001,
"PollingDelay": 300000,
"PassiveDelay": 7000,
"SendCallback": true,
"BindedCdevInfo": [
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 99, 99]
}
]
}
]
}