Merge TQ1A.221205.012

Bug: 255404110

Merged-In: Iaccac116abee988fa5256c8a6eca075d3ae13673
Change-Id: I990b60d85650b4e30618355b445d5fc996122ccf
This commit is contained in:
Xin Li 2022-11-29 15:18:13 -08:00
commit ee03aa794d
6 changed files with 134 additions and 222 deletions

View file

@ -178,9 +178,9 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
sar_test sar_test
# declare use of spatial audio # declare use of spatial audio: disabled
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true ro.audio.spatializer_enabled=false
# Keymaster HAL # Keymaster HAL
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
@ -262,7 +262,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# 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=6 ro.vendor.build.svn=10
# DCK properties based on target # DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

View file

@ -161,9 +161,9 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
sar_test sar_test
# declare use of spatial audio # declare use of spatial audio: disabled
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true ro.audio.spatializer_enabled=false
# Keymaster HAL # Keymaster HAL
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
@ -249,7 +249,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# 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=6 ro.vendor.build.svn=10
# DCK properties based on target # DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

View file

@ -558,6 +558,14 @@
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
{
"Name": "PMU_MID_LIMIT_FREQ",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/limit_frequency",
"Values": [
"1836000"
],
"DefaultIndex": 0
},
{ {
"Name": "PMU_MID_LCPI_THRESHOLD", "Name": "PMU_MID_LCPI_THRESHOLD",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold",
@ -1115,6 +1123,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_LIMIT_FREQ",
"Duration": 0,
"Value": "1836000"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_LCPI_THRESHOLD", "Node": "PMU_MID_LCPI_THRESHOLD",
@ -1211,60 +1225,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_LCPI_THRESHOLD",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_LCPI_THRESHOLD",
"Duration": 0,
"Value": "3"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0,
"Value": "50"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 0,
"Value": "1826000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_LCPI_THRESHOLD",
"Duration": 0,
"Value": "3"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 0,
"Value": "50"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "EM_Profile",
"Duration": 0,
"Value": "cam1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1277,6 +1237,24 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1826000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
"Value": "1491000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "MemFreq", "Node": "MemFreq",

View file

@ -555,6 +555,14 @@
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
{
"Name": "PMU_MID_LIMIT_FREQ",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/limit_frequency",
"Values": [
"1836000"
],
"DefaultIndex": 0
},
{ {
"Name": "PMU_MID_LCPI_THRESHOLD", "Name": "PMU_MID_LCPI_THRESHOLD",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold",
@ -1157,6 +1165,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_LIMIT_FREQ",
"Duration": 0,
"Value": "1836000"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_LCPI_THRESHOLD", "Node": "PMU_MID_LCPI_THRESHOLD",
@ -1253,60 +1267,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_LCPI_THRESHOLD",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_LCPI_THRESHOLD",
"Duration": 0,
"Value": "3"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0,
"Value": "50"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 0,
"Value": "1826000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_LCPI_THRESHOLD",
"Duration": 0,
"Value": "3"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 0,
"Value": "50"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "EM_Profile",
"Duration": 0,
"Value": "cam1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1319,6 +1279,24 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1826000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
"Value": "1491000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "MemFreq", "Node": "MemFreq",

View file

@ -547,6 +547,14 @@
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
{
"Name": "PMU_MID_LIMIT_FREQ",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/limit_frequency",
"Values": [
"1836000"
],
"DefaultIndex": 0
},
{ {
"Name": "PMU_MID_LCPI_THRESHOLD", "Name": "PMU_MID_LCPI_THRESHOLD",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold",
@ -1002,6 +1010,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_LIMIT_FREQ",
"Duration": 0,
"Value": "1836000"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_LCPI_THRESHOLD", "Node": "PMU_MID_LCPI_THRESHOLD",
@ -1098,60 +1112,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_LCPI_THRESHOLD",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_LCPI_THRESHOLD",
"Duration": 0,
"Value": "3"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0,
"Value": "50"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 0,
"Value": "1826000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_LCPI_THRESHOLD",
"Duration": 0,
"Value": "3"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 0,
"Value": "50"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "EM_Profile",
"Duration": 0,
"Value": "cam1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1164,6 +1124,24 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1826000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
"Value": "1491000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "MemFreq", "Node": "MemFreq",

View file

@ -535,6 +535,14 @@
], ],
"DefaultIndex": 0 "DefaultIndex": 0
}, },
{
"Name": "PMU_MID_LIMIT_FREQ",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/limit_frequency",
"Values": [
"1836000"
],
"DefaultIndex": 0
},
{ {
"Name": "PMU_MID_LCPI_THRESHOLD", "Name": "PMU_MID_LCPI_THRESHOLD",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold",
@ -1024,6 +1032,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_LIMIT_FREQ",
"Duration": 0,
"Value": "1836000"
},
{ {
"PowerHint": "CAMERA_STREAMING_HIGH", "PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_LCPI_THRESHOLD", "Node": "PMU_MID_LCPI_THRESHOLD",
@ -1120,60 +1134,6 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_POLL",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_LCPI_THRESHOLD",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_LCPI_THRESHOLD",
"Duration": 0,
"Value": "3"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0,
"Value": "50"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_LIMIT_FREQ",
"Duration": 0,
"Value": "1826000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_LCPI_THRESHOLD",
"Duration": 0,
"Value": "3"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PMU_BIG_SPC_THRESHOLD",
"Duration": 0,
"Value": "50"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "EM_Profile",
"Duration": 0,
"Value": "cam1"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1186,6 +1146,24 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
"Value": "1826000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
"Value": "1491000"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
"Value": "1401000"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "MemFreq", "Node": "MemFreq",