Merge Android 13 QPR1

Bug: 261731544
Merged-In: If11cebf43d42208ad628f80adb5629c173692766
Change-Id: I8a7edd3ef9fed9202f7cc1085e8dad8f28a6c481
This commit is contained in:
Xin Li 2022-12-09 10:23:09 -08:00
commit 3ee4291643
16 changed files with 886 additions and 251 deletions

1
OWNERS Normal file
View file

@ -0,0 +1 @@
per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com

View file

@ -198,8 +198,8 @@
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes --> <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
<usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/> <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/>
<!-- for hifi --> <!-- for hifi -->
<usecase id="UC_HIFI_PLAYBACK" dev1="25"/> <usecase id="UC_HIFI_PLAYBACK" dev1="25" period="20" period_num="4"/>
<usecase id="UC_HIFI_RECORD" dev1="26"/> <usecase id="UC_HIFI_RECORD" dev1="26" period="20" period_num="4"/>
</usecase_attr> </usecase_attr>
<dsp_latency> <dsp_latency>

View file

@ -37,7 +37,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="compressed_offload" role="source" <mixPort name="compressed_offload" role="source"
flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING"> flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
<profile name="" format="AUDIO_FORMAT_MP3" <profile name="" format="AUDIO_FORMAT_MP3"
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>

View file

@ -30,6 +30,9 @@
<ctl name="PCM Stream Wait Time in MSec" value="100"/> <ctl name="PCM Stream Wait Time in MSec" value="100"/>
<ctl name="Voice PCM Stream Wait Time in MSec" value="500"/> <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
<!-- Enable it when AOC is ready to trim delay and padding -->
<ctl name="Gapless Offload Enable" value="1"/>
<!-- TDM 0 setting --> <!-- TDM 0 setting -->
<ctl name="TDM_0_RX Chan" value="Four"/> <ctl name="TDM_0_RX Chan" value="Four"/>
<ctl name="TDM_0_RX Format" value="S32_LE"/> <ctl name="TDM_0_RX Format" value="S32_LE"/>

View file

@ -13,10 +13,17 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
ifdef PHONE_CAR_BOARD_PRODUCT
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else
TARGET_SCREEN_DENSITY := 420
endif
TARGET_BOARD_INFO_FILE := device/google/bluejay/board-info.txt TARGET_BOARD_INFO_FILE := device/google/bluejay/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := bluejay TARGET_BOOTLOADER_BOARD_NAME := bluejay
TARGET_SCREEN_DENSITY := 420
USES_DEVICE_GOOGLE_BLUEJAY := true USES_DEVICE_GOOGLE_BLUEJAY := true
BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/gs101/BoardConfig-common.mk include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk include device/google/gs101/wifi/BoardConfig-wifi.mk

View file

@ -152,7 +152,7 @@
when adapting to brighter or darker environments. This parameter controls how quickly when adapting to brighter or darker environments. This parameter controls how quickly
brightness changes occur in response to an observed change in light level that exceeds the brightness changes occur in response to an observed change in light level that exceeds the
hysteresis threshold. --> hysteresis threshold. -->
<integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer> <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
<integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer> <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
<!-- Type of the udfps long press sensor. Empty if long press is not supported. --> <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
@ -166,76 +166,100 @@
<!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. --> <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
<string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string> <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
<!-- The max vibration strength allowed in audio haptic channels. -->
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.32</item>
<!-- the number of the max cached processes in the system. --> <!-- the number of the max cached processes in the system. -->
<integer name="config_customizedMaxCachedProcesses">64</integer> <integer name="config_customizedMaxCachedProcesses">64</integer>
<integer-array name="config_ambientThresholdLevels"> <integer-array name="config_ambientThresholdLevels">
<item>1</item> <item>2</item>
<item>2</item> <item>3</item>
<item>3</item> <item>4</item>
<item>4</item> <item>5</item>
<item>5</item> <item>6</item>
<item>6</item> <item>7</item>
<item>7</item> <item>8</item>
<item>8</item> <item>9</item>
<item>9</item> <item>10</item>
<item>10</item> <item>20</item>
<item>20</item> <item>30</item>
<item>30</item> <item>40</item>
<item>40</item> <item>50</item>
<item>50</item> <item>60</item>
<item>60</item> <item>70</item>
<item>70</item> <item>80</item>
<item>80</item> <item>90</item>
<item>90</item> <item>100</item>
<item>100</item> <item>200</item>
</integer-array> <item>300</item>
<item>400</item>
<item>500</item>
<item>1000</item>
<item>2000</item>
<item>3000</item>
<item>4000</item>
</integer-array>
<integer-array name="config_ambientBrighteningThresholds"> <integer-array name="config_ambientBrighteningThresholds">
<item>11373</item> <item>5186</item>
<item>5000</item> <item>4333</item>
<item>4333</item> <item>3666</item>
<item>3666</item> <item>2999</item>
<item>3000</item> <item>2759</item>
<item>2760</item> <item>2519</item>
<item>2520</item> <item>2279</item>
<item>2280</item> <item>2039</item>
<item>2040</item> <item>1799</item>
<item>1800</item> <item>799</item>
<item>800</item> <item>527</item>
<item>527</item> <item>499</item>
<item>500</item> <item>470</item>
<item>470</item> <item>517</item>
<item>396</item> <item>565</item>
<item>322</item> <item>612</item>
<item>248</item> <item>660</item>
<item>174</item> <item>708</item>
<item>99</item> <item>742</item>
<item>99</item> <item>636</item>
</integer-array> <item>582</item>
<item>549</item>
<item>369</item>
<item>294</item>
<item>269</item>
<item>220</item>
<item>220</item>
</integer-array>
<integer-array name="config_ambientDarkeningThresholds"> <integer-array name="config_ambientDarkeningThresholds">
<item>853</item> <item>525</item>
<item>700</item> <item>683</item>
<item>683</item> <item>666</item>
<item>666</item> <item>650</item>
<item>650</item> <item>640</item>
<item>640</item> <item>630</item>
<item>630</item> <item>620</item>
<item>620</item> <item>610</item>
<item>610</item> <item>600</item>
<item>600</item> <item>500</item>
<item>500</item> <item>500</item>
<item>500</item> <item>440</item>
<item>440</item> <item>385</item>
<item>385</item> <item>382</item>
<item>348</item> <item>379</item>
<item>311</item> <item>376</item>
<item>274</item> <item>373</item>
<item>237</item> <item>371</item>
<item>200</item> <item>367</item>
<item>200</item> <item>387</item>
</integer-array> <item>397</item>
<item>403</item>
<item>380</item>
<item>345</item>
<item>333</item>
<item>283</item>
<item>283</item>
</integer-array>
<!-- Boolean indicating if restoring network selection should be skipped --> <!-- Boolean indicating if restoring network selection should be skipped -->
<!-- The restoring is handled by modem if it is true --> <!-- The restoring is handled by modem if it is true -->

View file

@ -46,5 +46,14 @@
<dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen> <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen>
<dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen> <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen>
</resources> <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. -->
<dimen name="lock_icon_padding">56px</dimen>
<!-- Alpha in duration in ms for the auth ripple to become fully vislble.
If set to 0, it is immediately visible, which is desired for devices supporting UDFPS. -->
<integer name="auth_ripple_alpha_in_duration">0</integer>
<!-- Offset should not be more than 1mm -->
<dimen name="udfps_burn_in_offset_y">16px</dimen>
</resources>

View file

@ -3,7 +3,7 @@ import /vendor/etc/init/hw/init.gs101.rc
import /vendor/etc/init/hw/init.blueport.rc import /vendor/etc/init/hw/init.blueport.rc
# Start the twoshay touch service # Start the twoshay touch service
on late-init && property:vendor.device.modules.ready=1 on property:vendor.device.modules.ready=1
start twoshay start twoshay
# Toggle glove_mode according to touch_sensitivity_mode # Toggle glove_mode according to touch_sensitivity_mode
@ -30,3 +30,11 @@ on property:ro.boot.hardware.sku=GB17L
on property:sys.retaildemo.enabled=1 on property:sys.retaildemo.enabled=1
setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.stop.level 35
setprop persist.vendor.charge.start.level 30 setprop persist.vendor.charge.start.level 30
# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints
on property:sys.boot_completed=1
trigger override-sf-uclamp
on override-sf-uclamp
write /proc/vendor_sched/rt_uclamp_min 0
write /proc/vendor_sched/sf_uclamp_min 0

View file

@ -42,6 +42,8 @@ else
include device/google/gs101/fingerprint/udfps_factory.mk include device/google/gs101/fingerprint/udfps_factory.mk
endif endif
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,bluejay)
$(call soong_config_set,lyric,tuning_product,bluejay) $(call soong_config_set,lyric,tuning_product,bluejay)
$(call soong_config_set,google3a_config,target_device,bluejay) $(call soong_config_set,google3a_config,target_device,bluejay)
@ -60,7 +62,8 @@ PRODUCT_COPY_FILES += \
# Thermal Config # Thermal Config
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/bluejay/thermal_info_config_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json device/google/bluejay/thermal_info_config_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
device/google/bluejay/thermal_info_config_charge_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json
# Power HAL config # Power HAL config
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -98,7 +101,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ NfcNci \
Tag \ Tag \
android.hardware.nfc@1.2-service.st android.hardware.nfc-service.st
# SecureElement # SecureElement
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -110,7 +113,6 @@ PRODUCT_COPY_FILES += \
device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf
DEVICE_MANIFEST_FILE += \ DEVICE_MANIFEST_FILE += \
device/google/bluejay/nfc/manifest_nfc.xml \
device/google/bluejay/nfc/manifest_se_bluejay.xml device/google/bluejay/nfc/manifest_se_bluejay.xml
# PowerStats HAL # PowerStats HAL
@ -120,7 +122,7 @@ PRODUCT_SOONG_NAMESPACES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=18 ro.vendor.build.svn=20
# DCK properties based on target # DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
@ -152,7 +154,8 @@ PRODUCT_COPY_FILES += \
# Bluetooth # Bluetooth
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true persist.bluetooth.a2dp_aac.vbr_supported=true \
persist.bluetooth.firmware.selection=BCM.hcd
# Bluetooth HAL # Bluetooth HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -160,7 +163,7 @@ PRODUCT_PACKAGES += \
# Set zram size # Set zram size
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=2g vendor.zram.size=3g
# Enable camera 1080P 60FPS binning mode # Enable camera 1080P 60FPS binning mode
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
@ -221,7 +224,9 @@ PRODUCT_SHIPPING_API_LEVEL := 32
# Vibrator HAL # Vibrator HAL
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.supported_primitives=243 ro.vendor.vibrator.hal.supported_primitives=243 \
ro.vendor.vibrator.hal.f0.comp.enabled=0 \
ro.vendor.vibrator.hal.redc.comp.enabled=0
# Device features # Device features
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -231,3 +236,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.com.google.ime.kb_pad_port_b=6.4 \ ro.com.google.ime.kb_pad_port_b=6.4 \
ro.com.google.ime.height_ratio=1.05 ro.com.google.ime.height_ratio=1.05
# Enable adpf cpu hint session for SurfaceFlinger
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
debug.sf.enable_adpf_cpu_hint=true

View file

@ -20,7 +20,9 @@
SuplSslMethod="SSLv23_NO_TLSv1_2" SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplEnable="true" SuplEnable="true"
SuplUseApn="true" SuplUseApn="false"
SuplUseApnNI="true"
SuplDummyCellInfo="true"
SuplUseFwCellInfo="false" SuplUseFwCellInfo="false"
SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertDirPath="/etc/security/cacerts"
SuplTlsCertPath="/vendor/etc/gnss/gps.cer" SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
@ -57,9 +59,11 @@
CpLppeUseAgnssLocForEmptyDbh="true" CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false" ReAidingOnHotStart="false"
ReAidingIntervalSec="1200" ReAidingIntervalSec="1200"
PpsDevice="/sys/class/pps/pps0/assert_elapsed"
/> />
<gll <gll
PpsEnable="true"
LogPriMask="LOG_INFO" LogPriMask="LOG_INFO"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI" LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"

View file

@ -19,7 +19,9 @@
SuplSslMethod="SSLv23_NO_TLSv1_2" SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplEnable="true" SuplEnable="true"
SuplUseApn="true" SuplUseApn="false"
SuplUseApnNI="true"
SuplDummyCellInfo="true"
SuplUseFwCellInfo="false" SuplUseFwCellInfo="false"
SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertDirPath="/etc/security/cacerts"
SuplTlsCertPath="/vendor/etc/gnss/gps.cer" SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
@ -56,9 +58,11 @@
CpLppeUseAgnssLocForEmptyDbh="true" CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false" ReAidingOnHotStart="false"
ReAidingIntervalSec="1200" ReAidingIntervalSec="1200"
PpsDevice="/sys/class/pps/pps0/assert_elapsed"
/> />
<gll <gll
PpsEnable="true"
LogPriMask="LOG_INFO" LogPriMask="LOG_INFO"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI" LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"

View file

@ -16,3 +16,5 @@ modprobe|snd-soc-cs40l26.ko
# All device specific modules loaded # All device specific modules loaded
setprop|vendor.device.modules.ready setprop|vendor.device.modules.ready
setprop|vendor.all.modules.ready
setprop|vendor.all.devices.ready

View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc" NCI_HAL_MODULE="nfc_nci.st21nfc"
############################################################################### ###############################################################################
# White list to be set at startup. # Allow list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0} DEVICE_HOST_ALLOW_LIST={02:C0}
############################################################################### ###############################################################################
# BAIL OUT value for P2P # BAIL OUT value for P2P

View file

@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc" NCI_HAL_MODULE="nfc_nci.st21nfc"
############################################################################### ###############################################################################
# White list to be set at startup. # Allow list to be set at startup.
DEVICE_HOST_WHITE_LIST={02:C0} DEVICE_HOST_ALLOW_LIST={02:C0}
############################################################################### ###############################################################################
# BAIL OUT value for P2P # BAIL OUT value for P2P

View file

@ -125,7 +125,7 @@
"Path": "/proc/vendor_sched/util_threshold", "Path": "/proc/vendor_sched/util_threshold",
"Values": [ "Values": [
"1280", "1280",
"1100" "1100 1078 1024"
], ],
"DefaultIndex": 0, "DefaultIndex": 0,
"ResetOnInit": true "ResetOnInit": true
@ -144,9 +144,7 @@
"Path": "/proc/vendor_sched/ta_uclamp_min", "Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [ "Values": [
"553", "553",
"185", "1"
"1",
"55"
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
@ -159,16 +157,6 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "SFUClampBoost",
"Path": "/proc/vendor_sched/sf_uclamp_min",
"Values": [
"161",
"85",
"39"
],
"ResetOnInit": true
},
{ {
"Name": "MLUclampBoost", "Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min", "Path": "/proc/vendor_sched/nnapi_uclamp_min",
@ -215,15 +203,6 @@
], ],
"ResetOnInit": true "ResetOnInit": true
}, },
{
"Name": "RestrictedCpuset",
"Path": "/dev/cpuset/restricted/cpus",
"Values": [
"0-3",
"0-7"
],
"ResetOnInit": false
},
{ {
"Name": "CDHighCpusetCpus", "Name": "CDHighCpusetCpus",
"Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus",
@ -474,15 +453,31 @@
"1" "1"
], ],
"DefaultIndex": 0 "DefaultIndex": 0
},
{
"Name": "Dex2oatThreads",
"Path": "vendor.powerhal.dalvik.vm.dex2oat-threads",
"Values": [
"1",
"2",
"4",
"6",
"8"
],
"Type": "Property"
},
{
"Name": "Dex2oatCPUSet",
"Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set",
"Values": [
"0,1,2,3",
"0,1,2,3,4,5",
"0,1,2,3,4,5,6,7"
],
"Type": "Property"
} }
], ],
"Actions": [ "Actions": [
{
"PowerHint": "INTERACTION",
"Node": "SFUClampBoost",
"Duration": 5000,
"Value": "85"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "UClampThreshold", "Node": "UClampThreshold",
@ -501,12 +496,6 @@
"Duration": 5000, "Duration": 5000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "LAUNCH",
"Node": "SFUClampBoost",
"Duration": 5000,
"Value": "85"
},
{ {
"PowerHint": "LAUNCH", "PowerHint": "LAUNCH",
"Node": "CPUBigClusterMaxFreq", "Node": "CPUBigClusterMaxFreq",
@ -895,7 +884,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CPUUtilThreshold", "Node": "CPUUtilThreshold",
"Duration": 0, "Duration": 0,
"Value": "1100" "Value": "1100 1078 1024"
}, },
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
@ -1279,7 +1268,7 @@
"PowerHint": "REFRESH_60FPS", "PowerHint": "REFRESH_60FPS",
"Node": "TAUClampBoost", "Node": "TAUClampBoost",
"Duration": 0, "Duration": 0,
"Value": "55" "Value": "1"
}, },
{ {
"PowerHint": "ADPF_DISABLE_TA_BOOST", "PowerHint": "ADPF_DISABLE_TA_BOOST",
@ -1287,32 +1276,6 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "ADPF_DISABLE_TA_BOOST",
"Type": "MaskHint",
"Value": "BOOST_DISPLAY"
},
{
"PowerHint": "ADPF_DISABLE_TA_BOOST",
"Type": "EndHint",
"Value": "BOOST_60HZ"
},
{
"PowerHint": "BOOST_DISPLAY",
"Type": "DoHint",
"Value": "BOOST_60HZ"
},
{
"PowerHint": "INTERACTION",
"Type": "DoHint",
"Value": "BOOST_DISPLAY"
},
{
"PowerHint": "BOOST_60HZ",
"Node": "TAUClampBoost",
"Duration": 200,
"Value": "185"
},
{ {
"PowerHint": "DISPLAY_IDLE", "PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle", "Node": "FGPreferIdle",
@ -1325,11 +1288,6 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "DISPLAY_IDLE",
"Type": "EndHint",
"Value": "INTERACTION"
},
{ {
"PowerHint": "DISPLAY_IDLE", "PowerHint": "DISPLAY_IDLE",
"Type": "EndHint", "Type": "EndHint",
@ -1365,6 +1323,138 @@
"Duration": 0, "Duration": 0,
"Value": "400000" "Value": "400000"
}, },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "G3dControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "G3dSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "6"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "Dex2oatCPUSet",
"Duration": 0,
"Value": "0,1,2,3,4,5"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "G3dControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "G3dSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "4"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE",
"Node": "Dex2oatCPUSet",
"Duration": 0,
"Value": "0,1,2,3"
},
{ {
"PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
"Node": "PMU_POLL", "Node": "PMU_POLL",
@ -1420,16 +1510,166 @@
"Value": "60000" "Value": "60000"
}, },
{ {
"PowerHint": "FACE_UNLOCK_BOOST", "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
"Node": "CPUBigClusterMaxFreq", "Node": "Dex2oatThreads",
"Duration": 1000, "Duration": 0,
"Value": "9999999" "Value": "4"
}, },
{ {
"PowerHint": "FACE_UNLOCK_BOOST", "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
"Node": "CPUBigClusterMinFreq", "Node": "Dex2oatCPUSet",
"Duration": 1000, "Duration": 0,
"Value": "9999999" "Value": "0,1,2,3"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "G3dControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "G3dSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "2"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL",
"Node": "Dex2oatCPUSet",
"Duration": 0,
"Value": "0,1,2,3"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "CPU_MID_TSKIN_BYPASS",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "CPU_BIG_TSKIN_BYPASS",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "G3dControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "G3dSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "Dex2oatCPUSet",
"Duration": 0,
"Value": "0,1,2,3"
}, },
{ {
"PowerHint": "FACE_UNLOCK_BOOST", "PowerHint": "FACE_UNLOCK_BOOST",
@ -1491,101 +1731,11 @@
"Duration": 1000, "Duration": 1000,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "BigControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "MidControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "LittleControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "G3dControlTempSet",
"Duration": 0,
"Value": "80000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "G3dSwitchOnTempSet",
"Duration": 0,
"Value": "60000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "CPU_MID_TSKIN_BYPASS",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
"Node": "CPU_BIG_TSKIN_BYPASS",
"Duration": 0,
"Value": "0"
},
{ {
"PowerHint": "ML_ACC", "PowerHint": "ML_ACC",
"Node": "MLUclampBoost", "Node": "MLUclampBoost",
"Duration": 2000, "Duration": 2000,
"Value": "512" "Value": "512"
},
{
"PowerHint": "DEVICE_IDLE",
"Node": "RestrictedCpuset",
"Duration": 0,
"Value": "0-3"
},
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "RestrictedCpuset",
"Duration": 0,
"Value": "0-3"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
} }
], ],
"AdpfConfig": [ "AdpfConfig": [

View file

@ -0,0 +1,414 @@
{
"Sensors":[
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"32.0",
"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/neutral_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
},
{
"Name":"skin_therm1",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"skin_therm2",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"disp_therm",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"usb_pwr_therm2",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"39.0",
"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/usb_pwr_therm2/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"charger_skin_therm",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QUIET-NEUTRAL",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"quiet_therm",
"neutral_therm"
],
"Coefficient":[
"0.7",
"0.3"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEUTRAL-SKIN2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"neutral_therm",
"skin_therm2"
],
"Coefficient":[
"0.7",
"0.3"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NEUTRAL",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"neutral_therm",
"skin_therm1",
"disp_therm",
"skin_therm2",
"gnss_tcxo_therm"
],
"Coefficient":[
"0.35",
"0.2",
"0.1",
"0.15",
"0.2"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"neutral_therm",
"Formula":"MAXIMUM",
"Combination":[
"VIRTUAL-NEUTRAL-SKIN2",
"VIRTUAL-NEUTRAL",
"VIRTUAL-QUIET-NEUTRAL"
],
"Coefficient":[
"1.0",
"1.0",
"1.0"
],
"HotThreshold":[
"NAN",
"39.0",
"41.0",
"43.0",
"45.0",
"47.0",
"55.0"
],
"HotHysteresis":[
0.0,
1.9,
1.9,
1.9,
1.9,
1.9,
1.9
],
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":300000,
"PassiveDelay":7000,
"BindedCdevInfo": [
{
"CdevRequest": "fcc",
"LimitInfo": [0, 4, 6, 6, 8, 8, 8],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
"CdevFloorWithPowerLink": [0, 0, 3, 6, 6 ,8 ,8],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
}
]
},
{
"Name":"USB2-MINUS-CHG",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"usb_pwr_therm2",
"charger_skin_therm"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"VIRTUAL-USB-THROTTLING",
"Type":"USB_PORT",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor":"usb_pwr_therm2",
"Combination":[
"usb_pwr_therm2",
"USB2-MINUS-CHG"
],
"Coefficient":[
"39000",
"7000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"2.0",
"NAN",
"NAN"
],
"BindedCdevInfo":[
{
"CdevRequest": "usbc-port",
"LimitInfo": [0, 0, 0, 0, 1, 1, 1]
}
],
"VrThreshold":"NAN",
"Multiplier":1,
"PollingDelay":60000,
"PassiveDelay":7000
}
],
"CoolingDevices":[
{
"Name":"fcc",
"Type":"BATTERY"
},
{
"Name":"usbc-port",
"Type":"BATTERY"
}
],
"PowerRails":[
{
"Name":"VSYS_PWR_DISPLAY"
},
{
"Name":"S2M_VDD_CPUCL2",
"PowerSampleDelay":14000,
"PowerSampleCount":5
},
{
"Name":"S3M_VDD_CPUCL1",
"PowerSampleDelay":14000,
"PowerSampleCount":5
},
{
"Name":"S4M_VDD_CPUCL0",
"PowerSampleDelay":14000,
"PowerSampleCount":5
},
{
"Name":"S2S_VDD_G3D",
"PowerSampleDelay":14000,
"PowerSampleCount":5
},
{
"Name":"S5M_VDD_INT"
},
{
"Name":"S1M_VDD_MIF"
},
{
"Name":"POWER_FOR_CHARGING_THROTTLING",
"VirtualRails":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"VSYS_PWR_DISPLAY",
"S2M_VDD_CPUCL2",
"S3M_VDD_CPUCL1",
"S4M_VDD_CPUCL0",
"S5M_VDD_INT",
"S1M_VDD_MIF",
"S2S_VDD_G3D"
],
"Coefficient":[
"1.0",
"1.0",
"1.0",
"1.0",
"1.0",
"1.0",
"1.0"
],
"PowerSampleDelay":14000,
"PowerSampleCount":5
}
]
}