From a31dcea7d5756b1c38bfe8f3524d96b0e7a9e4c5 Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Tue, 15 Feb 2022 07:26:24 +0000 Subject: [PATCH 001/148] audio: update speaker protection bin file Change list: 1. Re-characterized speaker model on top speaker due to a design change 2. set Tmax to 105 degC for Waves tuning Bug: 198765357 Test: builds Change-Id: Ib1793b25c58aed5f7e4df2ff07b11f0cebf876da Signed-off-by: Robert Lee --- .../cs35l41/fw/cs35l41-dsp1-spk-prot.bin | Bin 5192 -> 5216 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/cheetah/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/cheetah/cs35l41/fw/cs35l41-dsp1-spk-prot.bin index 885f2c57c07464437f74dec4a309e41615e86395..d29e0abc4a095b4f9091fbe03a24cacd200e94fd 100644 GIT binary patch delta 898 zcmb7DZAepL6h6D#+HLo4IzPyfo7dsj%5ryZ)`B+CX-*SLOca0Iv<+QuPHhd*)np`O zxN5y&mR1n{Oj;VzAHhYZ=h z*K*Qj`h_jKr^#wld7G$1IGMc3BD}H;w6ITJmI!ZRavQ6sWAn(R3~8x|VUKq59}){w zd?68fG8iVVqruHHq!K`ZZ3~cFd?$(VFZ%AKoNfY95ymNKjV3TiP(CF$nv4+f>N9(# zzDVbQ+>ed%qwXfuR``ld+B{qUm)TXkdpHasPmS6f0yCIH=n|#n6G0=IqTFU9wyV$d zn|zUoSMKkX0>5)0Ix6d*c}=Lf09Kr}dGHT7Xb9s}qwXHYIvy++f~{air|3hXyFqvi z(2M5j!{k_$%diA0k$8PqS%8YZTbExsM-(H93*`V>C$>V3jRQ0hdjlKs|KVeY(p7!| zucx2~C#=uIIK8582yATpEgy8uY+?k7HLQHFRj zSB93={cR6cRsfxq&4`OF6-=?+;kLCQUYrtj#PuU({EH;4pvo4j@Y>j$8#udFwTDq@ Z+SyzrNyv`bu}h~j7&N(gdX@MDz;A};^Sb~5 delta 857 zcmb7CVMr5U7=G{0dDrgTygA7^=T1SGAhx@7*pDJ|X-!6!WtPOmT61JO%N5~_lM!ez zLivI)f}*4pOAxIn`ZI#4upyyY>JJ5*QC3pzM8@Ao`>GnU7e zPJys@<>cjxlGRl%%brHJt5meQwpQ;Jo2)Ls+~o3~@VN`?y}qtf7KR6)+HwhDuvf3j zpl|JkQ~+Tg0$c*Q1AqsC>K+v+cUcppgE|ckV&a(h#h2QJ zS4T2)yN%Ud2U@EFI`+)@`(O8 ze{W;*qDpK~aVqs$;8e+migcLQu5YLrNwqPb70pB1?6$_JOJskHx<)qLInYPC(9JcY z%p!mZr$C`I>fwwW`MCn7%ddgnjGxUyW}?BCK~%{aHih&M4;Va1QsM#D62!)+gu8I0 zA0{x{*y8cwBeH_GXPY6~EKNG2-~?wB-C!k(s;ffNtlzH3b`73jNQuV-mLQUV3M@y} zznoV%;_+d{h_MB4z{Pnao8XPj#VXeD*i~KYZ*^v%>En$~($&!}^aWbcR$Njd7F(sFT=i*yA4ym4q5uE@ From 09362e966b371077b71a38b14365260d774d7bfa Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 15 Feb 2022 14:10:11 +0800 Subject: [PATCH 002/148] audio: update baacl configuration Bug: 204271308 Test: build pass adb shell audio_waves_custom_action_tests adb shell "echo 10000 > /dev/thermal/tz-by-name/battery/emul_temp" adb shell "echo 80 > /dev/thermal/tz-by-name/soc/emul_temp" Signed-off-by: Jasmine Cha Change-Id: I6d32f82df45d80dfe2d1d16aad979b6277138402 --- audio/cheetah/tuning/waves/waves_config.ini | 13 +++++++------ audio/panther/tuning/waves/waves_config.ini | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/audio/cheetah/tuning/waves/waves_config.ini b/audio/cheetah/tuning/waves/waves_config.ini index 36e092a..3e8c870 100644 --- a/audio/cheetah/tuning/waves/waves_config.ini +++ b/audio/cheetah/tuning/waves/waves_config.ini @@ -6,6 +6,7 @@ ######################################################################################################## [HAL_SUPPORTED_FEATURES] CUSTOM_ACTION_258=1 +# Action 258 parameters: [dev, mode, throttle control state] ######################################################################################################## # This defined the options of supported sample rates. @@ -56,9 +57,9 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatIncrement=8 [CUSTOM_ACTION_258] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC -CASE_4=PRIORITY:3,NUMBERS:2:0|1:4,PRESET:SPEAKER_MUSIC_THROTTLE -CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:4,PRESET:SPEAKER_SAFE_CALL_THROTTLE -CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:4,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE +CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL_THROTTLE +CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE diff --git a/audio/panther/tuning/waves/waves_config.ini b/audio/panther/tuning/waves/waves_config.ini index 36e092a..3e8c870 100644 --- a/audio/panther/tuning/waves/waves_config.ini +++ b/audio/panther/tuning/waves/waves_config.ini @@ -6,6 +6,7 @@ ######################################################################################################## [HAL_SUPPORTED_FEATURES] CUSTOM_ACTION_258=1 +# Action 258 parameters: [dev, mode, throttle control state] ######################################################################################################## # This defined the options of supported sample rates. @@ -56,9 +57,9 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so #AudioFormatIncrement=8 [CUSTOM_ACTION_258] -CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC -CASE_4=PRIORITY:3,NUMBERS:2:0|1:4,PRESET:SPEAKER_MUSIC_THROTTLE -CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:4,PRESET:SPEAKER_SAFE_CALL_THROTTLE -CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:4,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE +CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2,PRESET:SPEAKER_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2,PRESET:SPEAKER_SAFE_MUSIC +CASE_4=PRIORITY:3,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_THROTTLE +CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0,PRESET:SPEAKER_SAFE_CALL_THROTTLE +CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE From e6bf77767483ebf68a8df62352a6e0557d41f97d Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Thu, 17 Feb 2022 02:05:32 +0000 Subject: [PATCH 003/148] audio: update speaker protection bin file Change list: 1. set Top speaker Tmax to 105 degC for Waves tuning Bug: 199029784 Test: Builds Change-Id: Ie7274f01f831a1b3e17c929472ebffe9d0f1d2a1 Signed-off-by: Robert Lee --- .../cs35l41/fw/cs35l41-dsp1-spk-prot.bin | Bin 5204 -> 5212 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/audio/panther/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/panther/cs35l41/fw/cs35l41-dsp1-spk-prot.bin index bbaeeeb87da27c4b53b6ebebebec92ad1fa1e61c..d284eaa260dae3f0c279a2570a0085129a002319 100644 GIT binary patch delta 128 zcmcbjaYti<0%PDrMGubnkle%yLj%)^nFfrE8)wLBO10 z^M6hwR%KBJh6M~_0TLe=#95^r82s{ delta 119 zcmcbkaYbW-0;A_dMURPv28;|F7um5gDKu<;#466hXVSpHz{&stb`6`^xr|tqB|u!s z2AKv1X;wJ~hX4N=7}6|n)%W=nZ+V_!w3dOvOk#5k{{lwl`v3no{})hUW;B?rBBI4- SXlZO}WNK_?V4=iS%K!jp;2*^R From 28c39289a3dfcbebfadff487bf87a76172fa977a Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Mon, 21 Feb 2022 15:22:35 +0800 Subject: [PATCH 004/148] powerhint: fork powerhint.json for pantah Move the powerhint.json from gs201 to pantah. Separate powerhint.json for each device. Test: build and manually check Bug: 207573241 Change-Id: I32d9093e48ca5f62cf0d05ec43a8b77b99ed254d --- device-cheetah.mk | 4 + device-cloudripper.mk | 4 + device-panther.mk | 4 + device-ravenclaw.mk | 4 + powerhint-cheetah.json | 1043 ++++++++++++++++++++++++++++++++++++ powerhint-cloudripper.json | 1043 ++++++++++++++++++++++++++++++++++++ powerhint-panther.json | 1043 ++++++++++++++++++++++++++++++++++++ powerhint-ravenclaw.json | 1043 ++++++++++++++++++++++++++++++++++++ 8 files changed, 4188 insertions(+) create mode 100644 powerhint-cheetah.json create mode 100644 powerhint-cloudripper.json create mode 100644 powerhint-panther.json create mode 100644 powerhint-ravenclaw.json diff --git a/device-cheetah.mk b/device-cheetah.mk index 5a2146b..bb866ff 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -105,6 +105,10 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_COPY_FILES += \ device/google/pantah/thermal_info_config_cheetah.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json +# Power HAL config +PRODUCT_COPY_FILES += \ + device/google/pantah/powerhint-cheetah.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + # Bluetooth HAL DEVICE_MANIFEST_FILE += \ device/google/pantah/bluetooth/manifest_bluetooth.xml diff --git a/device-cloudripper.mk b/device-cloudripper.mk index ad7b040..df54993 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -81,6 +81,10 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_COPY_FILES += \ device/google/pantah/thermal_info_config_cloudripper.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json +# Power HAL config +PRODUCT_COPY_FILES += \ + device/google/pantah/powerhint-cloudripper.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + # Bluetooth HAL DEVICE_MANIFEST_FILE += \ device/google/pantah/bluetooth/manifest_bluetooth.xml diff --git a/device-panther.mk b/device-panther.mk index 85b72a0..10c711c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -93,6 +93,10 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_COPY_FILES += \ device/google/pantah/thermal_info_config_panther.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json +# Power HAL config +PRODUCT_COPY_FILES += \ + device/google/pantah/powerhint-panther.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + # Bluetooth HAL DEVICE_MANIFEST_FILE += \ device/google/pantah/bluetooth/manifest_bluetooth.xml diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index b3f5b21..b0c7a49 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -86,6 +86,10 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_COPY_FILES += \ device/google/pantah/thermal_info_config_ravenclaw.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json +# Power HAL config +PRODUCT_COPY_FILES += \ + device/google/pantah/powerhint-ravenclaw.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + # Bluetooth HAL DEVICE_MANIFEST_FILE += \ device/google/pantah/bluetooth/manifest_bluetooth.xml diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json new file mode 100644 index 0000000..55f6ece --- /dev/null +++ b/powerhint-cheetah.json @@ -0,0 +1,1043 @@ +{ + "Nodes": [ + { + "Name": "MemFreq", + "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", + "Values": [ + "3172000", + "1014000", + "421000" + ], + "ResetOnInit": true + }, + { + "Name": "IntFreq", + "Path": "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/min_freq", + "Values": [ + "533000", + "100000" + ], + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1098000", + "1401000", + "1197000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1024000", + "1197000", + "1999000", + "1491000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "984000", + "1426000", + "1826000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1106000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", + "Values": [ + "762000", + "471000", + "400000", + "302000", + "151000" + ], + "ResetOnInit": true + }, + { + "Name": "CPUUtilThreshold", + "Path": "/sys/kernel/vendor_sched/util_threshold", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "MIFTargetLoad", + "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", + "Values": [ + "20 5 80", + "20 10 80" + ], + "ResetOnInit": true + }, + { + "Name": "TAUClampBoost", + "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Values": [ + "0", + "553", + "246", + "185", + "123", + "62" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CDPreferIdle", + "Path": "/sys/kernel/vendor_sched/cam_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, + { + "Name": "CDCpuset", + "Path": "/dev/cpuset/camera-daemon/cpus", + "Values": [ + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-high-group/cpus", + "Values": [ + "6-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", + "Values": [ + "4-5", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", + "Values": [ + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "F2fsRecessModeEnable", + "Path": "/dev/sys/fs/by-name/userdata/gc_urgent", + "Values": [ + "2", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferHighCap", + "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferIdle", + "Path": "/sys/kernel/vendor_sched/ta_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, + { + "Name": "CDPreferHighCap", + "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "DisplayWakeup", + "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "LimitFlashCurrent", + "Path": "vendor.camera.max_flash_current", + "Values": [ + "100", + "1500" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "INTCAMFreq", + "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + }, + { + "Name": "TNRFreq", + "Path": "/sys/devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + } + ], + "Actions": [ + { + "PowerHint": "INTERACTION", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBigClusterMinFreq", + "Duration": 6000, + "Value": "1106000" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUMidClusterMinFreq", + "Duration": 6000, + "Value": "1197000" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPULittleClusterMinFreq", + "Duration": 6000, + "Value": "1197000" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "INTERACTION_120", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "246" + }, + { + "PowerHint": "INTERACTION_90", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "185" + }, + { + "PowerHint": "INTERACTION_60", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "123" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "DEVICE_IDLE", + "Node": "F2fsRecessModeEnable", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "553" + }, + { + "PowerHint": "LAUNCH", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "F2fsRecessModeEnable", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "984000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1024000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1098000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "1426000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1197000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "MemFreq", + "Duration": 300, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "IntFreq", + "Duration": 1000, + "Value": "533000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "INTCAMFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "TNRFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferHighCap", + "Duration": 0, + "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", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "REFRESH_120FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "185" + }, + { + "PowerHint": "REFRESH_90FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "123" + }, + { + "PowerHint": "REFRESH_60FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "62" + }, + { + "PowerHint": "DISABLE_TA_BOOST", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "DoHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Node": "DisplayWakeup", + "Duration": 50, + "Value": "1" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "100" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "1500" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "PowerHALRenderingState", + "Duration": 0, + "Value": "EXPENSIVE_RENDERING" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "400000" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + } + ] +} diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json new file mode 100644 index 0000000..55f6ece --- /dev/null +++ b/powerhint-cloudripper.json @@ -0,0 +1,1043 @@ +{ + "Nodes": [ + { + "Name": "MemFreq", + "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", + "Values": [ + "3172000", + "1014000", + "421000" + ], + "ResetOnInit": true + }, + { + "Name": "IntFreq", + "Path": "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/min_freq", + "Values": [ + "533000", + "100000" + ], + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1098000", + "1401000", + "1197000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1024000", + "1197000", + "1999000", + "1491000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "984000", + "1426000", + "1826000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1106000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", + "Values": [ + "762000", + "471000", + "400000", + "302000", + "151000" + ], + "ResetOnInit": true + }, + { + "Name": "CPUUtilThreshold", + "Path": "/sys/kernel/vendor_sched/util_threshold", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "MIFTargetLoad", + "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", + "Values": [ + "20 5 80", + "20 10 80" + ], + "ResetOnInit": true + }, + { + "Name": "TAUClampBoost", + "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Values": [ + "0", + "553", + "246", + "185", + "123", + "62" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CDPreferIdle", + "Path": "/sys/kernel/vendor_sched/cam_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, + { + "Name": "CDCpuset", + "Path": "/dev/cpuset/camera-daemon/cpus", + "Values": [ + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-high-group/cpus", + "Values": [ + "6-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", + "Values": [ + "4-5", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", + "Values": [ + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "F2fsRecessModeEnable", + "Path": "/dev/sys/fs/by-name/userdata/gc_urgent", + "Values": [ + "2", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferHighCap", + "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferIdle", + "Path": "/sys/kernel/vendor_sched/ta_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, + { + "Name": "CDPreferHighCap", + "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "DisplayWakeup", + "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "LimitFlashCurrent", + "Path": "vendor.camera.max_flash_current", + "Values": [ + "100", + "1500" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "INTCAMFreq", + "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + }, + { + "Name": "TNRFreq", + "Path": "/sys/devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + } + ], + "Actions": [ + { + "PowerHint": "INTERACTION", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBigClusterMinFreq", + "Duration": 6000, + "Value": "1106000" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUMidClusterMinFreq", + "Duration": 6000, + "Value": "1197000" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPULittleClusterMinFreq", + "Duration": 6000, + "Value": "1197000" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "INTERACTION_120", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "246" + }, + { + "PowerHint": "INTERACTION_90", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "185" + }, + { + "PowerHint": "INTERACTION_60", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "123" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "DEVICE_IDLE", + "Node": "F2fsRecessModeEnable", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "553" + }, + { + "PowerHint": "LAUNCH", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "F2fsRecessModeEnable", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "984000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1024000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1098000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "1426000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1197000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "MemFreq", + "Duration": 300, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "IntFreq", + "Duration": 1000, + "Value": "533000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "INTCAMFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "TNRFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferHighCap", + "Duration": 0, + "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", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "REFRESH_120FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "185" + }, + { + "PowerHint": "REFRESH_90FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "123" + }, + { + "PowerHint": "REFRESH_60FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "62" + }, + { + "PowerHint": "DISABLE_TA_BOOST", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "DoHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Node": "DisplayWakeup", + "Duration": 50, + "Value": "1" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "100" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "1500" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "PowerHALRenderingState", + "Duration": 0, + "Value": "EXPENSIVE_RENDERING" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "400000" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + } + ] +} diff --git a/powerhint-panther.json b/powerhint-panther.json new file mode 100644 index 0000000..55f6ece --- /dev/null +++ b/powerhint-panther.json @@ -0,0 +1,1043 @@ +{ + "Nodes": [ + { + "Name": "MemFreq", + "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", + "Values": [ + "3172000", + "1014000", + "421000" + ], + "ResetOnInit": true + }, + { + "Name": "IntFreq", + "Path": "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/min_freq", + "Values": [ + "533000", + "100000" + ], + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1098000", + "1401000", + "1197000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1024000", + "1197000", + "1999000", + "1491000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "984000", + "1426000", + "1826000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1106000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", + "Values": [ + "762000", + "471000", + "400000", + "302000", + "151000" + ], + "ResetOnInit": true + }, + { + "Name": "CPUUtilThreshold", + "Path": "/sys/kernel/vendor_sched/util_threshold", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "MIFTargetLoad", + "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", + "Values": [ + "20 5 80", + "20 10 80" + ], + "ResetOnInit": true + }, + { + "Name": "TAUClampBoost", + "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Values": [ + "0", + "553", + "246", + "185", + "123", + "62" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CDPreferIdle", + "Path": "/sys/kernel/vendor_sched/cam_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, + { + "Name": "CDCpuset", + "Path": "/dev/cpuset/camera-daemon/cpus", + "Values": [ + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-high-group/cpus", + "Values": [ + "6-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", + "Values": [ + "4-5", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", + "Values": [ + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "F2fsRecessModeEnable", + "Path": "/dev/sys/fs/by-name/userdata/gc_urgent", + "Values": [ + "2", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferHighCap", + "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferIdle", + "Path": "/sys/kernel/vendor_sched/ta_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, + { + "Name": "CDPreferHighCap", + "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "DisplayWakeup", + "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "LimitFlashCurrent", + "Path": "vendor.camera.max_flash_current", + "Values": [ + "100", + "1500" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "INTCAMFreq", + "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + }, + { + "Name": "TNRFreq", + "Path": "/sys/devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + } + ], + "Actions": [ + { + "PowerHint": "INTERACTION", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBigClusterMinFreq", + "Duration": 6000, + "Value": "1106000" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUMidClusterMinFreq", + "Duration": 6000, + "Value": "1197000" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPULittleClusterMinFreq", + "Duration": 6000, + "Value": "1197000" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "INTERACTION_120", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "246" + }, + { + "PowerHint": "INTERACTION_90", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "185" + }, + { + "PowerHint": "INTERACTION_60", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "123" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "DEVICE_IDLE", + "Node": "F2fsRecessModeEnable", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "553" + }, + { + "PowerHint": "LAUNCH", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "F2fsRecessModeEnable", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "984000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1024000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1098000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "1426000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1197000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "MemFreq", + "Duration": 300, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "IntFreq", + "Duration": 1000, + "Value": "533000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "INTCAMFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "TNRFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferHighCap", + "Duration": 0, + "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", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "REFRESH_120FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "185" + }, + { + "PowerHint": "REFRESH_90FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "123" + }, + { + "PowerHint": "REFRESH_60FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "62" + }, + { + "PowerHint": "DISABLE_TA_BOOST", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "DoHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Node": "DisplayWakeup", + "Duration": 50, + "Value": "1" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "100" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "1500" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "PowerHALRenderingState", + "Duration": 0, + "Value": "EXPENSIVE_RENDERING" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "400000" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + } + ] +} diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json new file mode 100644 index 0000000..55f6ece --- /dev/null +++ b/powerhint-ravenclaw.json @@ -0,0 +1,1043 @@ +{ + "Nodes": [ + { + "Name": "MemFreq", + "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", + "Values": [ + "3172000", + "1014000", + "421000" + ], + "ResetOnInit": true + }, + { + "Name": "IntFreq", + "Path": "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/min_freq", + "Values": [ + "533000", + "100000" + ], + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1098000", + "1401000", + "1197000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1024000", + "1197000", + "1999000", + "1491000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "984000", + "1426000", + "1826000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1106000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", + "Values": [ + "762000", + "471000", + "400000", + "302000", + "151000" + ], + "ResetOnInit": true + }, + { + "Name": "CPUUtilThreshold", + "Path": "/sys/kernel/vendor_sched/util_threshold", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "MIFTargetLoad", + "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", + "Values": [ + "20 5 80", + "20 10 80" + ], + "ResetOnInit": true + }, + { + "Name": "TAUClampBoost", + "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", + "Values": [ + "0", + "553", + "246", + "185", + "123", + "62" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CDPreferIdle", + "Path": "/sys/kernel/vendor_sched/cam_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, + { + "Name": "CDCpuset", + "Path": "/dev/cpuset/camera-daemon/cpus", + "Values": [ + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-high-group/cpus", + "Values": [ + "6-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", + "Values": [ + "4-5", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", + "Values": [ + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "F2fsRecessModeEnable", + "Path": "/dev/sys/fs/by-name/userdata/gc_urgent", + "Values": [ + "2", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferHighCap", + "Path": "/sys/kernel/vendor_sched/ta_prefer_high_cap", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAPreferIdle", + "Path": "/sys/kernel/vendor_sched/ta_prefer_idle", + "Values": [ + "0", + "1" + ], + "ResetOnInit": true + }, + { + "Name": "CDPreferHighCap", + "Path": "/sys/kernel/vendor_sched/cam_prefer_high_cap", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "DisplayWakeup", + "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "LimitFlashCurrent", + "Path": "vendor.camera.max_flash_current", + "Values": [ + "100", + "1500" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "INTCAMFreq", + "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + }, + { + "Name": "TNRFreq", + "Path": "/sys/devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + } + ], + "Actions": [ + { + "PowerHint": "INTERACTION", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUBigClusterMinFreq", + "Duration": 6000, + "Value": "1106000" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPUMidClusterMinFreq", + "Duration": 6000, + "Value": "1197000" + }, + { + "PowerHint": "INTERACTION", + "Node": "CPULittleClusterMinFreq", + "Duration": 6000, + "Value": "1197000" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "INTERACTION_120", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "246" + }, + { + "PowerHint": "INTERACTION_90", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "185" + }, + { + "PowerHint": "INTERACTION_60", + "Node": "TAUClampBoost", + "Duration": 6000, + "Value": "123" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_120" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_90" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION_60" + }, + { + "PowerHint": "DEVICE_IDLE", + "Node": "F2fsRecessModeEnable", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "553" + }, + { + "PowerHint": "LAUNCH", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "F2fsRecessModeEnable", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "984000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1024000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1098000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "1426000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1197000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "MemFreq", + "Duration": 300, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "IntFreq", + "Duration": 1000, + "Value": "533000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "INTCAMFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "TNRFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "TAPreferHighCap", + "Duration": 3000, + "Value": "1" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferHighCap", + "Duration": 0, + "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", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferHighCap", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MIFTargetLoad", + "Duration": 0, + "Value": "20 10 80" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDHighCpusetCpus", + "Duration": 0, + "Value": "6-7" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDMidCpusetCpus", + "Duration": 0, + "Value": "4-5" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CDMidHighCpusetCpus", + "Duration": 0, + "Value": "4-7" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "REFRESH_120FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "185" + }, + { + "PowerHint": "REFRESH_90FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "123" + }, + { + "PowerHint": "REFRESH_60FPS", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "62" + }, + { + "PowerHint": "DISABLE_TA_BOOST", + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "DoHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "INTERACTION" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Type": "EndHint", + "Value": "DISABLE_TA_BOOST" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Node": "DisplayWakeup", + "Duration": 50, + "Value": "1" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "100" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "1500" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "PowerHALRenderingState", + "Duration": 0, + "Value": "EXPENSIVE_RENDERING" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "400000" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + } + ] +} From e53dead22ed2625217d9718b8f1184f8e963fa15 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Mon, 21 Feb 2022 23:55:29 +0800 Subject: [PATCH 005/148] powerhint: update the config with gs101 update powerhint.json for panther and cheetah Test: Build and check trace Bug: 207573241 Change-Id: I3c27fdbe70cf8c950ea2c09bb7a813261838cb23 --- powerhint-cheetah.json | 560 +++++++++++++++++++++++++++++++---------- powerhint-panther.json | 539 ++++++++++++++++++++++++++++++--------- 2 files changed, 849 insertions(+), 250 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 55f6ece..0112ee0 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -26,7 +26,11 @@ "9999999", "1098000", "1401000", - "1197000" + "930000", + "1197000", + "1328000", + "1598000", + "1803000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -48,8 +52,12 @@ "9999999", "1024000", "1197000", - "1999000", - "1491000" + "1491000", + "910000", + "1328000", + "1663000", + "1836000", + "1999000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -71,7 +79,12 @@ "9999999", "984000", "1426000", - "1826000" + "1826000", + "1277000", + "1582000", + "1745000", + "2048000", + "2401000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -121,12 +134,32 @@ "Name": "TAUClampBoost", "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", "Values": [ - "0", - "553", - "246", - "185", - "123", - "62" + "553", + "158", + "108", + "43", + "1", + "157", + "42" + ], + "ResetOnInit": true + }, + { + "Name": "SFUClampBoost", + "Path": "/sys/kernel/vendor_sched/sf_uclamp_min", + "Values": [ + "125", + "65", + "30" + ], + "ResetOnInit": true + }, + { + "Name": "MLUclampBoost", + "Path": "/sys/kernel/vendor_sched/nnapi_uclamp_min", + "Values": [ + "154", + "512" ], "DefaultIndex": 0, "ResetOnInit": true @@ -149,6 +182,15 @@ ], "ResetOnInit": true }, + { + "Name": "RestrictedCpuset", + "Path": "/dev/cpuset/restricted/cpus", + "Values": [ + "0-3", + "0-7" + ], + "ResetOnInit": false + }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -256,109 +298,103 @@ "67000" ], "ResetOnInit": true + }, + { + "Name": "GPUPowerPolicy", + "Path": "/sys/devices/platform/28000000.mali/power_policy", + "Values": [ + "always_on", + "adaptive" + ], + "ResetOnInit": true + }, + { + "Name": "BigControlTempSet", + "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "MidControlTempSet", + "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "LittleControlTempSet", + "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Values": [ + "95000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "G3dControlTempSet", + "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "BigSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "MidSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "LittleSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "G3dSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false } ], "Actions": [ { "PowerHint": "INTERACTION", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBigClusterMinFreq", - "Duration": 6000, - "Value": "1106000" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUMidClusterMinFreq", - "Duration": 6000, - "Value": "1197000" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPULittleClusterMinFreq", - "Duration": 6000, - "Value": "1197000" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "INTERACTION_120", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "246" - }, - { - "PowerHint": "INTERACTION_90", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "185" - }, - { - "PowerHint": "INTERACTION_60", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "123" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_60" + "Node": "SFUClampBoost", + "Duration": 5000, + "Value": "65" }, { "PowerHint": "DEVICE_IDLE", @@ -366,16 +402,34 @@ "Duration": 0, "Value": "2" }, + { + "PowerHint": "LAUNCH_120FPS", + "Node": "SFUClampBoost", + "Duration": 1000, + "Value": "125" + }, { "PowerHint": "LAUNCH", - "Node": "CPUMidClusterMaxFreq", + "Type": "DoHint", + "Value": "LAUNCH_120FPS" + }, + { + "PowerHint": "LAUNCH", + "Node": "SFUClampBoost", + "Duration": 5000, + "Value": "65" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMaxFreq", "Duration": 5000, "Value": "9999999" }, { "PowerHint": "LAUNCH", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" }, { "PowerHint": "LAUNCH", @@ -395,6 +449,12 @@ "Duration": 5000, "Value": "3172000" }, + { + "PowerHint": "LAUNCH", + "Node": "GPUPowerPolicy", + "Duration": 5000, + "Value": "always_on" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "F2fsRecessModeEnable", @@ -449,6 +509,24 @@ "Duration": 1000, "Value": "4-7" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -953,34 +1031,176 @@ "Duration": 0, "Value": "9999999" }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "930000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1197000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_70", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1328000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_80", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1598000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_90", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1803000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_50", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "910000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_60", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1328000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_70", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1663000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_80", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1836000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_90", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1999000" + }, + { + "PowerHint": "LOW_POWER_CPU_50", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1277000" + }, + { + "PowerHint": "LOW_POWER_CPU_60", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1582000" + }, + { + "PowerHint": "LOW_POWER_CPU_70", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1745000" + }, + { + "PowerHint": "LOW_POWER_CPU_80", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "2048000" + }, + { + "PowerHint": "LOW_POWER_CPU_90", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "2401000" + }, { "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "185" - }, - { - "PowerHint": "REFRESH_90FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "123" + "Value": "157" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "62" + "Value": "42" }, { - "PowerHint": "DISABLE_TA_BOOST", + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "LAUNCH_120FPS" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", "Node": "TAUClampBoost", "Duration": 0, - "Value": "0" + "Value": "1" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "MaskHint", + "Value": "BOOST_DISPLAY" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "EndHint", + "Value": "BOOST_120HZ" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "EndHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "BOOST_DISPLAY", + "Type": "DoHint", + "Value": "BOOST_120HZ" + }, + { + "PowerHint": "BOOST_DISPLAY", + "Type": "DoHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "BOOST_DISPLAY" + }, + { + "PowerHint": "BOOST_120HZ", + "Node": "TAUClampBoost", + "Duration": 200, + "Value": "158" + }, + { + "PowerHint": "BOOST_60HZ", + "Node": "TAUClampBoost", + "Duration": 200, + "Value": "108" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "BOOST_120HZ" }, { "PowerHint": "DISPLAY_IDLE", - "Type": "DoHint", - "Value": "DISABLE_TA_BOOST" + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "1" }, { "PowerHint": "DISPLAY_IDLE", @@ -990,12 +1210,17 @@ { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", - "Value": "DISPLAY_UPDATE_IMMINENT" + "Value": "BOOST_120HZ" }, { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", @@ -1003,6 +1228,11 @@ "Duration": 50, "Value": "1" }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Type": "DoHint", + "Value": "BOOST_DISPLAY" + }, { "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", "Node": "LimitFlashCurrent", @@ -1027,6 +1257,66 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1038,6 +1328,24 @@ "Node": "CPUBigClusterMinFreq", "Duration": 1000, "Value": "9999999" + }, + { + "PowerHint": "ML_ACC", + "Node": "MLUclampBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "DEVICE_IDLE", + "Node": "RestrictedCpuset", + "Duration": 0, + "Value": "0-3" + }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "RestrictedCpuset", + "Duration": 0, + "Value": "0-3" } ] } diff --git a/powerhint-panther.json b/powerhint-panther.json index 55f6ece..7eff29c 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -26,7 +26,11 @@ "9999999", "1098000", "1401000", - "1197000" + "930000", + "1197000", + "1328000", + "1598000", + "1803000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -48,8 +52,12 @@ "9999999", "1024000", "1197000", - "1999000", - "1491000" + "1491000", + "910000", + "1328000", + "1663000", + "1836000", + "1999000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -71,7 +79,12 @@ "9999999", "984000", "1426000", - "1826000" + "1826000", + "1277000", + "1582000", + "1745000", + "2048000", + "2401000" ], "DefaultIndex": 0, "ResetOnInit": true @@ -121,12 +134,31 @@ "Name": "TAUClampBoost", "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", "Values": [ - "0", - "553", - "246", - "185", - "123", - "62" + "553", + "108", + "43", + "1", + "107", + "42" + ], + "ResetOnInit": true + }, + { + "Name": "SFUClampBoost", + "Path": "/sys/kernel/vendor_sched/sf_uclamp_min", + "Values": [ + "125", + "65", + "30" + ], + "ResetOnInit": true + }, + { + "Name": "MLUclampBoost", + "Path": "/sys/kernel/vendor_sched/nnapi_uclamp_min", + "Values": [ + "154", + "512" ], "DefaultIndex": 0, "ResetOnInit": true @@ -149,6 +181,15 @@ ], "ResetOnInit": true }, + { + "Name": "RestrictedCpuset", + "Path": "/dev/cpuset/restricted/cpus", + "Values": [ + "0-3", + "0-7" + ], + "ResetOnInit": false + }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -256,109 +297,103 @@ "67000" ], "ResetOnInit": true + }, + { + "Name": "GPUPowerPolicy", + "Path": "/sys/devices/platform/28000000.mali/power_policy", + "Values": [ + "always_on", + "adaptive" + ], + "ResetOnInit": true + }, + { + "Name": "BigControlTempSet", + "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "MidControlTempSet", + "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "LittleControlTempSet", + "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Values": [ + "95000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "G3dControlTempSet", + "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "BigSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "MidSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "LittleSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "G3dSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false } ], "Actions": [ { "PowerHint": "INTERACTION", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUBigClusterMinFreq", - "Duration": 6000, - "Value": "1106000" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPUMidClusterMinFreq", - "Duration": 6000, - "Value": "1197000" - }, - { - "PowerHint": "INTERACTION", - "Node": "CPULittleClusterMinFreq", - "Duration": 6000, - "Value": "1197000" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "INTERACTION_120", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "246" - }, - { - "PowerHint": "INTERACTION_90", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "185" - }, - { - "PowerHint": "INTERACTION_60", - "Node": "TAUClampBoost", - "Duration": 6000, - "Value": "123" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "INTERACTION_60" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_120" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_90" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION_60" + "Node": "SFUClampBoost", + "Duration": 5000, + "Value": "65" }, { "PowerHint": "DEVICE_IDLE", @@ -368,14 +403,21 @@ }, { "PowerHint": "LAUNCH", - "Node": "CPUMidClusterMaxFreq", + "Node": "SFUClampBoost", + "Duration": 5000, + "Value": "65" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMaxFreq", "Duration": 5000, "Value": "9999999" }, { "PowerHint": "LAUNCH", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" }, { "PowerHint": "LAUNCH", @@ -395,6 +437,12 @@ "Duration": 5000, "Value": "3172000" }, + { + "PowerHint": "LAUNCH", + "Node": "GPUPowerPolicy", + "Duration": 5000, + "Value": "always_on" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "F2fsRecessModeEnable", @@ -449,6 +497,24 @@ "Duration": 1000, "Value": "4-7" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, { "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", @@ -954,33 +1020,170 @@ "Value": "9999999" }, { - "PowerHint": "REFRESH_120FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "185" + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "930000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1197000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_70", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1328000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_80", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1598000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_90", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1803000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_50", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "910000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_60", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1328000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_70", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1663000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_80", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1836000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_90", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1999000" + }, + { + "PowerHint": "LOW_POWER_CPU_50", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1277000" + }, + { + "PowerHint": "LOW_POWER_CPU_60", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1582000" + }, + { + "PowerHint": "LOW_POWER_CPU_70", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1745000" + }, + { + "PowerHint": "LOW_POWER_CPU_80", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "2048000" + }, + { + "PowerHint": "LOW_POWER_CPU_90", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "2401000" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "123" + "Value": "107" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "62" + "Value": "42" }, { - "PowerHint": "DISABLE_TA_BOOST", + "PowerHint": "ADPF_DISABLE_TA_BOOST", "Node": "TAUClampBoost", "Duration": 0, - "Value": "0" + "Value": "1" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "MaskHint", + "Value": "BOOST_DISPLAY" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "EndHint", + "Value": "BOOST_90HZ" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "EndHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "BOOST_DISPLAY", + "Type": "DoHint", + "Value": "BOOST_90HZ" + }, + { + "PowerHint": "BOOST_DISPLAY", + "Type": "DoHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "BOOST_DISPLAY" + }, + { + "PowerHint": "BOOST_90HZ", + "Node": "TAUClampBoost", + "Duration": 200, + "Value": "108" + }, + { + "PowerHint": "BOOST_60HZ", + "Node": "TAUClampBoost", + "Duration": 200, + "Value": "108" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "BOOST_90HZ" }, { "PowerHint": "DISPLAY_IDLE", - "Type": "DoHint", - "Value": "DISABLE_TA_BOOST" + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "1" }, { "PowerHint": "DISPLAY_IDLE", @@ -990,12 +1193,17 @@ { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", - "Value": "DISPLAY_UPDATE_IMMINENT" + "Value": "BOOST_90HZ" }, { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", @@ -1003,6 +1211,11 @@ "Duration": 50, "Value": "1" }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Type": "DoHint", + "Value": "BOOST_DISPLAY" + }, { "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", "Node": "LimitFlashCurrent", @@ -1027,6 +1240,66 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1038,6 +1311,24 @@ "Node": "CPUBigClusterMinFreq", "Duration": 1000, "Value": "9999999" + }, + { + "PowerHint": "ML_ACC", + "Node": "MLUclampBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "DEVICE_IDLE", + "Node": "RestrictedCpuset", + "Duration": 0, + "Value": "0-3" + }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "RestrictedCpuset", + "Duration": 0, + "Value": "0-3" } ] } From f22e1a32e7edef22fa1002ba09fb6e09726e357c Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Tue, 22 Feb 2022 23:26:01 +0800 Subject: [PATCH 006/148] powerhint: Remove unused TAUClampBoost value Bug: 207573241 Test: boot to home Change-Id: Icd80b1195d023b4781585ffe5e65322df47194aa --- powerhint-cheetah.json | 1 - powerhint-panther.json | 1 - 2 files changed, 2 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 0112ee0..143c5aa 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -137,7 +137,6 @@ "553", "158", "108", - "43", "1", "157", "42" diff --git a/powerhint-panther.json b/powerhint-panther.json index 7eff29c..3cc56ca 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -136,7 +136,6 @@ "Values": [ "553", "108", - "43", "1", "107", "42" From c9f55902d1841fa3786f3e3be3f56366a655c3a4 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Wed, 2 Mar 2022 22:31:41 +0000 Subject: [PATCH 007/148] thermal: update C10 and P10 thermal configurations Update virtual-skin and virtual-skin-charge with v2 coefficients. Bug: 220922474 Test: Build and boot on device. Check thermal configuration Signed-off-by: Sayanna Chandula Change-Id: I81224836d03fe501b6472d568e037019c61b7dca --- thermal_info_config_cheetah.json | 52 ++++++++++++++++++++++++-------- thermal_info_config_panther.json | 34 ++++++++++----------- 2 files changed, 57 insertions(+), 29 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index a88aa37..18181bc 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -150,19 +150,19 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-QI-USB", + "Name":"VIRTUAL-GNSS-DISP", "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ - "qi_therm", - "usb_pwr_therm" + "gnss_tcxo_therm", + "disp_therm" ], "Coefficient":[ - "0.650", - "0.350" + "0.5", + "0.5" ], - "Offset":-1300, + "Offset":-200, "HotThreshold":[ "NAN", "NAN", @@ -237,10 +237,36 @@ "quiet_therm" ], "Coefficient":[ - "0.760", - "0.240" + "0.650", + "0.350" ], - "Offset":-2100, + "Offset":-1700, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL-USB", + "Type":"UNKNOWN", + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "usb_pwr_therm" + ], + "Coefficient":[ + "0.460", + "0.540" + ], + "Offset":-3200, "HotThreshold":[ "NAN", "NAN", @@ -260,7 +286,7 @@ "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "VIRTUAL-QI-USB", + "VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2" ], @@ -327,9 +353,11 @@ "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "VIRTUAL-NEUTRAL-QUIET" + "VIRTUAL-NEUTRAL-QUIET", + "VIRTUAL-NEUTRAL-USB" ], "Coefficient":[ + "1.0", "1.0" ], "HotThreshold":[ @@ -392,7 +420,7 @@ "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", "Combination":[ - "VIRTUAL-QI-USB", + "VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2" ], diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index ef853f2..2d18aaf 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -162,7 +162,7 @@ "0.680", "0.320" ], - "Offset":-2200, + "Offset":-2800, "HotThreshold":[ "NAN", "NAN", @@ -185,10 +185,10 @@ "quiet_therm" ], "Coefficient":[ - "0.6", - "0.4" + "0.52", + "0.48" ], - "Offset":-2900, + "Offset":-500, "HotThreshold":[ "NAN", "NAN", @@ -202,19 +202,19 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-GNSS-USB2", + "Name":"VIRTUAL-GNSS-DISP", "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ "gnss_tcxo_therm", - "usb_pwr_therm2" + "disp_therm" ], "Coefficient":[ - "0.668", - "0.332" + "0.7", + "0.3" ], - "Offset":-1557, + "Offset":-500, "HotThreshold":[ "NAN", "NAN", @@ -237,10 +237,10 @@ "quiet_therm" ], "Coefficient":[ - "0.675", - "0.325" + "0.4", + "0.6" ], - "Offset":-1900, + "Offset":-1500, "HotThreshold":[ "NAN", "NAN", @@ -263,10 +263,10 @@ "usb_pwr_therm" ], "Coefficient":[ - "0.734", - "0.266" + "0.6", + "0.4" ], - "Offset":-2271, + "Offset":-4000, "HotThreshold":[ "NAN", "NAN", @@ -288,7 +288,7 @@ "Combination":[ "VIRTUAL-QI-USB", "VIRTUAL-USB-QUIET", - "VIRTUAL-GNSS-USB2" + "VIRTUAL-GNSS-DISP" ], "Coefficient":[ "1.0", @@ -422,7 +422,7 @@ "Combination":[ "VIRTUAL-QI-USB", "VIRTUAL-USB-QUIET", - "VIRTUAL-GNSS-USB2" + "VIRTUAL-GNSS-DISP" ], "Coefficient":[ "1.0", From 4edc5e5aef4eb15996c32ac726e20a0773d365cc Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 21 Apr 2022 18:18:24 +0000 Subject: [PATCH 008/148] Revert "powerhint: Remove unused TAUClampBoost value" Revert submission 16977206-powerhint_remove_unused_value Reason for revert: resolve merge conflict Reverted Changes: Icd80b1195:powerhint: Remove unused TAUClampBoost value I21ad42d98:powerhint: Remove unused TAUClampBoost value Change-Id: I59400b9f71e02c9f491a513334a8ffa195be7015 --- powerhint-cheetah.json | 1 + powerhint-panther.json | 1 + 2 files changed, 2 insertions(+) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 14a058e..53f3d79 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -138,6 +138,7 @@ "553", "158", "108", + "43", "1", "157", "53" diff --git a/powerhint-panther.json b/powerhint-panther.json index 67f41ce..c076a5f 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -137,6 +137,7 @@ "Values": [ "553", "108", + "43", "1", "107", "53" From bed6b74be9c16dea0427bf7e08f306e9776b72a4 Mon Sep 17 00:00:00 2001 From: "Chung-Kai (Michael) Mei" Date: Fri, 22 Apr 2022 14:23:41 +0000 Subject: [PATCH 009/148] Revert^2 "powerhint: Remove unused TAUClampBoost value" 4edc5e5aef4eb15996c32ac726e20a0773d365cc Change-Id: Ic865cc2c690ceec16984f7134a0f7ee13c0845f4 --- powerhint-cheetah.json | 1 - powerhint-panther.json | 1 - 2 files changed, 2 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 53f3d79..14a058e 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -138,7 +138,6 @@ "553", "158", "108", - "43", "1", "157", "53" diff --git a/powerhint-panther.json b/powerhint-panther.json index c076a5f..67f41ce 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -137,7 +137,6 @@ "Values": [ "553", "108", - "43", "1", "107", "53" From 908d5c56f967ddf71caa08cc24fd7546bdc3233f Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:22:32 +0800 Subject: [PATCH 010/148] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Change-Id: I4d83f6b430cd6d4d4b1b49cd71f5e0a135655149 --- device-cheetah.mk | 3 +-- device-cloudripper.mk | 3 +-- device-panther.mk | 3 +-- device-ravenclaw.mk | 3 +-- manifest.xml | 9 --------- nfc/libnfc-hal-st-proto1.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 8 insertions(+), 21 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index f02cd87..c342eb5 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -91,7 +91,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -105,7 +105,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 0356a70..6f6fdcb 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -60,7 +60,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -74,7 +74,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-panther.mk b/device-panther.mk index f390c44..15e3a18 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -78,7 +78,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -92,7 +92,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index e4d9223..a749564 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -79,7 +79,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/manifest.xml b/manifest.xml index 73b4e42..aafe372 100644 --- a/manifest.xml +++ b/manifest.xml @@ -113,15 +113,6 @@ hwbinder @1.3::IDevice/google-edgetpu - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - android.hardware.health hwbinder diff --git a/nfc/libnfc-hal-st-proto1.conf b/nfc/libnfc-hal-st-proto1.conf index ed1f57b..feb933a 100644 --- a/nfc/libnfc-hal-st-proto1.conf +++ b/nfc/libnfc-hal-st-proto1.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 60e84ac..f553e3d 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From 82df7ed9d247dafc72d580e32d3a9a0d2a1cb914 Mon Sep 17 00:00:00 2001 From: George Chang Date: Fri, 29 Apr 2022 23:36:15 +0800 Subject: [PATCH 011/148] Revert "Switch NFC from HIDL to AIDL" This reverts commit 908d5c56f967ddf71caa08cc24fd7546bdc3233f. Reason for revert: Broken tests Bug: 230834308 Change-Id: I2bfa841fb7af7fa963cbf270f2c9626f93d7146d --- device-cheetah.mk | 3 ++- device-cloudripper.mk | 3 ++- device-panther.mk | 3 ++- device-ravenclaw.mk | 3 ++- manifest.xml | 9 +++++++++ nfc/libnfc-hal-st-proto1.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index c342eb5..f02cd87 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -91,7 +91,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -105,6 +105,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 6f6fdcb..0356a70 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -60,7 +60,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -74,6 +74,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-panther.mk b/device-panther.mk index 15e3a18..f390c44 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -78,7 +78,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -92,6 +92,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index a749564..e4d9223 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -79,6 +79,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/manifest.xml b/manifest.xml index aafe372..73b4e42 100644 --- a/manifest.xml +++ b/manifest.xml @@ -113,6 +113,15 @@ hwbinder @1.3::IDevice/google-edgetpu + + android.hardware.nfc + hwbinder + 1.2 + + INfc + default + + android.hardware.health hwbinder diff --git a/nfc/libnfc-hal-st-proto1.conf b/nfc/libnfc-hal-st-proto1.conf index feb933a..ed1f57b 100644 --- a/nfc/libnfc-hal-st-proto1.conf +++ b/nfc/libnfc-hal-st-proto1.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index f553e3d..60e84ac 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From e9f6d97077cfd471d6338d0fddd576ba75772e19 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:22:32 +0800 Subject: [PATCH 012/148] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Change-Id: Ieb8be71d3ac4e8e187d8fcc2e3843bfd17112a73 --- device-cheetah.mk | 3 +-- device-cloudripper.mk | 3 +-- device-panther.mk | 3 +-- device-ravenclaw.mk | 3 +-- manifest.xml | 9 --------- nfc/libnfc-hal-st-proto1.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 8 insertions(+), 21 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 01439b0..02762df 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -96,7 +96,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -110,7 +110,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 0356a70..6f6fdcb 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -60,7 +60,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -74,7 +74,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-panther.mk b/device-panther.mk index 0ec7270..01892d0 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -81,7 +81,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -95,7 +95,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index e4d9223..a749564 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -79,7 +79,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/pantah/nfc/manifest_nfc.xml \ device/google/pantah/nfc/manifest_se.xml # Thermal Config diff --git a/manifest.xml b/manifest.xml index 73b4e42..aafe372 100644 --- a/manifest.xml +++ b/manifest.xml @@ -113,15 +113,6 @@ hwbinder @1.3::IDevice/google-edgetpu - - android.hardware.nfc - hwbinder - 1.2 - - INfc - default - - android.hardware.health hwbinder diff --git a/nfc/libnfc-hal-st-proto1.conf b/nfc/libnfc-hal-st-proto1.conf index ed1f57b..feb933a 100644 --- a/nfc/libnfc-hal-st-proto1.conf +++ b/nfc/libnfc-hal-st-proto1.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 60e84ac..f553e3d 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From 4b1b25fad6f5ee3254fcb773d304769e44533b81 Mon Sep 17 00:00:00 2001 From: Stephane Lee Date: Thu, 12 May 2022 17:15:17 -0700 Subject: [PATCH 013/148] Remove device-specific support for GoogleBattery HAL This is covered by parent projects. Bug: 232461104 Test: Ensure Adaptive Charging/Battery health flags works as expected Change-Id: Ifdd0f70ccd69f9c239c7c70ac43db5fd3631be42 --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index aafe372..d41ea1e 100644 --- a/manifest.xml +++ b/manifest.xml @@ -122,15 +122,6 @@ default - - vendor.google.google_battery - hwbinder - 1.2 - - IGoogleBattery - default - - vendor.google.whitechapel.audio.audioext hwbinder From 8a64ba5d0163f215d207db729a9d1b9b308785c7 Mon Sep 17 00:00:00 2001 From: jimmyshiu Date: Thu, 21 Jul 2022 01:21:52 +0000 Subject: [PATCH 014/148] Remove universal touch boost Bug: 236781877 Test: PtsUiBench Change-Id: I0f1cbf5249d711ccba15a8f17161928d0ec607d9 --- powerhint-cheetah-a0.json | 63 --------------------------------------- powerhint-cheetah.json | 63 --------------------------------------- powerhint-panther-a0.json | 63 --------------------------------------- powerhint-panther.json | 63 --------------------------------------- 4 files changed, 252 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 3974f21..e4351bf 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -138,7 +138,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "612", - "185", "1", "63" ], @@ -1311,58 +1310,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_120HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1380,16 +1327,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 8b55958..aaf1244 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -156,7 +156,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "612", - "185", "1", "63" ], @@ -1332,58 +1331,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_120HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1401,16 +1348,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 9e84dab..98883cb 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -137,7 +137,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "612", - "185", "1", "63" ], @@ -1294,58 +1293,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_90HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1363,16 +1310,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-panther.json b/powerhint-panther.json index 1896925..9166126 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -155,7 +155,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "612", - "185", "1", "63" ], @@ -1304,58 +1303,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_90HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1373,16 +1320,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", From 5ab7e56d928863feba8178199388e3e6873d8f46 Mon Sep 17 00:00:00 2001 From: Chase Wu Date: Thu, 23 Jun 2022 20:34:07 +0800 Subject: [PATCH 015/148] haptics: add actuator model Bug: 236202962 Test: verified actuator model config propogated and handled properly by vibrator HAL Signed-off-by: Chase Wu Change-Id: I2be634fdf51c369f69b49cfe99c0e9f717d81c90 --- device-cheetah.mk | 5 ++++- device-panther.mk | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3bc8f53..719c576 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -296,8 +296,11 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true # Vibrator HAL +ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=1 + ro.vendor.vibrator.hal.chirp.enabled=1 \ + ro.vendor.vibrator.hal.device.mass=0.214 \ + ro.vendor.vibrator.hal.loc.coeff=2.7 PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.firmware.selection=BCM.hcd diff --git a/device-panther.mk b/device-panther.mk index d3624cf..2435969 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -284,8 +284,11 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true # Vibrator HAL +ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=1 + ro.vendor.vibrator.hal.chirp.enabled=1 \ + ro.vendor.vibrator.hal.device.mass=0.195 \ + ro.vendor.vibrator.hal.loc.coeff=2.65 PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.firmware.selection=BCM.hcd From a3f7310eac3fbe5bb8de9cb70e89bea25e4a8abc Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 3 Aug 2022 18:17:51 -0700 Subject: [PATCH 016/148] Remove FPS boost Bug: 241312961 Test: Build Change-Id: I5fbdc1063d2ac0c468d2a8c5b00293adac7d4179 Signed-off-by: Wei Wang --- powerhint-cheetah.json | 7 +++---- powerhint-panther.json | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 4378c7c..ae64bc7 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -166,8 +166,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "612", - "1", - "63" + "1" ], "ResetOnInit": true }, @@ -1424,13 +1423,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "63" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "63" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", diff --git a/powerhint-panther.json b/powerhint-panther.json index 9166126..800376c 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -155,8 +155,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "612", - "1", - "63" + "1" ], "ResetOnInit": true }, @@ -1289,13 +1288,13 @@ "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "63" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "63" + "Value": "1" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", From 2946ff87e8e21e051c9c5066e239d5f2f51dcc48 Mon Sep 17 00:00:00 2001 From: achigoliu Date: Thu, 4 Aug 2022 18:49:01 +0800 Subject: [PATCH 017/148] Bundle handheld_core_hardware.xml Bug: 237110906 Test: Manual, verify build artifacts Signed-off-by: achigoliu Change-Id: I1ef786ec0d909efce1899eb2003a88750af64af7 --- device-cheetah.mk | 4 ++++ device-cloudripper.mk | 4 ++++ device-panther.mk | 4 ++++ device-ravenclaw.mk | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3b8af0d..e4d80fb 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -329,3 +329,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Enable camera exif model/make reporting PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-cloudripper.mk b/device-cloudripper.mk index f16be67..d90c4af 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -176,3 +176,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.firmware.selection=BCM.hcd + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-panther.mk b/device-panther.mk index a3372d5..1a3bb65 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -315,3 +315,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Enable camera exif model/make reporting PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 066d88e..27a1cdd 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -178,3 +178,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.firmware.selection=BCM.hcd + +# Device features +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml From 2dd1a62ca49c88a01654b4af424949d32fb4ea73 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Wed, 3 Aug 2022 21:40:12 +0000 Subject: [PATCH 018/148] Enable ADPF CPU hints for SF Allow these devices to send CPU hints to PowerHAL from SF to reduce drops and save power. Bug: b/241152899 Bug: b/195990840 Test: manual Change-Id: Idb7dad41852c71bff9b3c63d2d75849128288080 --- conf/init.pantah.rc | 8 ++++++++ device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ powerhint-cheetah-a0.json | 28 ---------------------------- powerhint-cheetah.json | 28 ---------------------------- powerhint-panther-a0.json | 22 ---------------------- powerhint-panther.json | 22 ---------------------- 7 files changed, 16 insertions(+), 100 deletions(-) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 7c64e7e..b1ad297 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -130,3 +130,11 @@ on property:vendor.device.modules.ready=1 chown system system /proc/focaltech_touch/selftest/Scap_Rawdata chown system system /proc/focaltech_touch/selftest/Short chown system system /proc/focaltech_touch/selftest/Strength + +# 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 diff --git a/device-cheetah.mk b/device-cheetah.mk index e4d80fb..a7c3d9c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -333,3 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/device-panther.mk b/device-panther.mk index 1a3bb65..a2f4b53 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -319,3 +319,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 79588d9..ec24509 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -162,16 +162,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "159", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -530,18 +520,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, - { - "PowerHint": "LAUNCH_120FPS", - "Node": "SFUClampBoost", - "Duration": 1000, - "Value": "159" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -553,12 +531,6 @@ "Type": "DoHint", "Value": "LAUNCH_120FPS" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index a42dc48..772b4e8 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -188,16 +188,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "159", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -536,12 +526,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -560,12 +544,6 @@ "Duration": 1000, "Value": "10" }, - { - "PowerHint": "LAUNCH_120FPS", - "Node": "SFUClampBoost", - "Duration": 1000, - "Value": "159" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -582,12 +560,6 @@ "Type": "DoHint", "Value": "LAUNCH_GPU" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 98883cb..f26e9be 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -151,16 +151,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "159", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -519,24 +509,12 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther.json b/powerhint-panther.json index 800376c..e037835 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -168,16 +168,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "159", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -516,12 +506,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -540,12 +524,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", From 6a9883e60947c1709fa3a3bb60d78a630074e3f4 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 16 Aug 2022 14:02:51 +0800 Subject: [PATCH 019/148] move bcmbt settings to gs-common Bug: 242661555 Test: build pass Change-Id: Iace4472741e429192235bd618878cd3b8b0f33b3 --- device-cheetah.mk | 3 +-- device-cloudripper.mk | 3 +-- device-panther.mk | 3 +-- device-ravenclaw.mk | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index b9c4ebc..fba3e1a 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -29,7 +29,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay include device/google/pantah/audio/cheetah/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) @@ -145,7 +145,6 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_SOONG_NAMESPACES += \ vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf diff --git a/device-cloudripper.mk b/device-cloudripper.mk index d90c4af..6eeaddd 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -25,7 +25,7 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloud include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml $(call soong_config_set,lyric,tuning_product,cloudripper) @@ -99,7 +99,6 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_SOONG_NAMESPACES += \ vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf diff --git a/device-panther.mk b/device-panther.mk index 027d843..5684383 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -29,7 +29,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay include device/google/pantah/audio/panther/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml $(call soong_config_set,lyric,tuning_product,panther) @@ -128,7 +128,6 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_SOONG_NAMESPACES += \ vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 27a1cdd..3b63de3 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -25,7 +25,7 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/raven include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/ravenclaw/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),) @@ -97,7 +97,6 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_SOONG_NAMESPACES += \ vendor/broadcom/bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf From 27ff4eb0b67932e6ecb915a3fcc98499985bc3fb Mon Sep 17 00:00:00 2001 From: Jeff Pu Date: Wed, 17 Aug 2022 14:52:08 -0400 Subject: [PATCH 020/148] Enable Virtual Fingerprint HAL support Bug: 230515082 Test: Verified on both P10 and C10 userdebug/eng targets Change-Id: I792d15edff24ee9fd346514bfca840ba866d11ed --- device-cheetah.mk | 3 +++ device-panther.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 846ef80..557cf52 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -337,3 +337,6 @@ PRODUCT_COPY_FILES += \ # Enable adpf cpu hint session for SurfaceFlinger PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ debug.sf.enable_adpf_cpu_hint=true + +# Virtual fingerprint HAL +PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example diff --git a/device-panther.mk b/device-panther.mk index 5684383..b4762b8 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -323,3 +323,6 @@ PRODUCT_COPY_FILES += \ # Enable adpf cpu hint session for SurfaceFlinger PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ debug.sf.enable_adpf_cpu_hint=true + +# Virtual fingerprint HAL +PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example From b3c75103f17015881f2114469ac53b3530a331fb Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Tue, 30 Aug 2022 14:16:53 -0700 Subject: [PATCH 021/148] uwb: update vendor hal folder location Bug: 241468038 Change-Id: I6c84b59fe4cabedb4764d1ce9b2d62c69787a34a --- uwb/uwb_calibration.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index eb2bfe0..2624c41 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -14,7 +14,7 @@ # limitations under the License. # UWB - ultra wide band -$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk) LOCAL_UWB_CAL_DIR=device/google/pantah/uwb From 1c5f81faaaf7a83ea60ebe25b9ded625285972fb Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Thu, 1 Sep 2022 21:39:19 +0000 Subject: [PATCH 022/148] Revert "uwb: update vendor hal folder location" Revert "uwb: update vendor hal folder location" Revert "uwb: move uwb hal into dw3000-hal folder" Revert "uwb: update vendor hal folder location" Revert submission 19786107-241468038 Reason for revert: b/244619620 - This change will cause automerger conflicts and should go into tm-qpr-dev since tm-qpr-dev is still actively being used. Reverted Changes: I6c84b59fe:uwb: update vendor hal folder location If64da8254:uwb: update vendor hal folder location Ie3a507f22:uwb: update vendor hal folder location Ib5c22ea7e:uwb: move uwb hal into dw3000-hal folder Id48f26750:uwb: update vendor hal folder location I1a05fe35f:uwb: update vendor hal folder location Change-Id: Iabadb8929392f9793547153a6cb8bfc0de8a1357 --- uwb/uwb_calibration.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 2624c41..eb2bfe0 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -14,7 +14,7 @@ # limitations under the License. # UWB - ultra wide band -$(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) LOCAL_UWB_CAL_DIR=device/google/pantah/uwb From 41969d9eab5a4031c76ecb58c90de6d28ba14b2f Mon Sep 17 00:00:00 2001 From: Vincent Wang Date: Thu, 18 Aug 2022 14:55:37 +0800 Subject: [PATCH 023/148] Move fingerprint and face haptic form server to sysui(2/3) BUG: 237621645 Test: Check the vibrator work normally when using biometric unlock Change-Id: Ib64abdff6a6e3eec2ead03849cf37b8fdcf0750e --- .../base/core/res/res/values/bools.xml | 20 ------------------- .../base/core/res/res/values/bools.xml | 20 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 cheetah/overlay/frameworks/base/core/res/res/values/bools.xml delete mode 100644 panther/overlay/frameworks/base/core/res/res/values/bools.xml diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/bools.xml b/cheetah/overlay/frameworks/base/core/res/res/values/bools.xml deleted file mode 100644 index 9e75363..0000000 --- a/cheetah/overlay/frameworks/base/core/res/res/values/bools.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - false - diff --git a/panther/overlay/frameworks/base/core/res/res/values/bools.xml b/panther/overlay/frameworks/base/core/res/res/values/bools.xml deleted file mode 100644 index 9e75363..0000000 --- a/panther/overlay/frameworks/base/core/res/res/values/bools.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - false - From f3f226ee45d765fe058f490d0151a6bbcd16b320 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 26 Aug 2022 08:33:59 +0800 Subject: [PATCH 024/148] Move bt Compatibility matrix to gs-common Bug: 242661555 Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test Change-Id: I5c2428cc42a712b3c416bd62ec6c70c05ea0a82f --- bluetooth/manifest_bluetooth.xml | 56 --------------------- device-cheetah.mk | 73 ++++++++++++---------------- device-cloudripper.mk | 21 +++----- device-panther.mk | 75 +++++++++++++---------------- device-ravenclaw.mk | 19 ++------ device_framework_matrix_product.xml | 10 ---- 6 files changed, 77 insertions(+), 177 deletions(-) delete mode 100644 bluetooth/manifest_bluetooth.xml delete mode 100644 device_framework_matrix_product.xml diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml deleted file mode 100644 index 64238c7..0000000 --- a/bluetooth/manifest_bluetooth.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - android.hardware.bluetooth - hwbinder - 1.1 - - IBluetoothHci - default - - - - hardware.google.bluetooth.bt_channel_avoidance - hwbinder - 1.0 - - IBTChannelAvoidance - default - - - - hardware.google.bluetooth.sar - hwbinder - 1.1 - - IBluetoothSar - default - - - - hardware.google.bluetooth.ext - hwbinder - 1.0 - - IBluetoothExt - default - - - - hardware.google.bluetooth.ccc - hwbinder - 1.1 - - IBluetoothCcc - default - - - - hardware.google.bluetooth.ewp - hwbinder - 1.0 - - IBluetoothEwp - default - - - diff --git a/device-cheetah.mk b/device-cheetah.mk index a8bb6b9..eb5b3d7 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -31,7 +31,6 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) include device/google/pantah/uwb/uwb_calibration.mk endif @@ -140,12 +139,6 @@ PRODUCT_COPY_FILES += \ device/google/pantah/powerhint-cheetah-a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-a0.json # Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/pantah/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth -PRODUCT_PACKAGES += \ - bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf PRODUCT_PROPERTY_OVERRIDES += \ @@ -153,10 +146,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus -# Spatial Audio -PRODUCT_PACKAGES += \ - libspatialaudio - # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ hci_inject @@ -175,6 +164,38 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES_DEBUG += \ sar_test +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.firmware.selection=BCM.hcd + +# Bluetooth AAC VBR +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.a2dp_aac.vbr_supported=true + +# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=262238 +else +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=94 +endif +# Bluetooth LE Audio +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio_offload.supported=true \ + persist.bluetooth.leaudio_offload.disabled=false \ + ro.bluetooth.leaudio_switcher.supported=true + +# Bluetooth EWP test tool +PRODUCT_PACKAGES_DEBUG += \ + ewp_tool +# default BDADDR for EVB only +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" + +# Spatial Audio +PRODUCT_PACKAGES += \ + libspatialaudio + # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true @@ -209,10 +230,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/pantah/powerstats/cheetah \ @@ -279,16 +296,6 @@ PRODUCT_PACKAGES += \ SettingsOverlayGE2AE \ SettingsOverlayGP4BC -# Bluetooth LE Audio -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=false \ - ro.bluetooth.leaudio_switcher.supported=true - -# Bluetooth EWP test tool -PRODUCT_PACKAGES_DEBUG += \ - ewp_tool - # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ @@ -307,22 +314,6 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.device.mass=0.214 \ ro.vendor.vibrator.hal.loc.coeff=2.7 -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.firmware.selection=BCM.hcd - -# Bluetooth AAC VBR -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.a2dp_aac.vbr_supported=true - -# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=262238 -else -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=94 -endif - # Keyboard bottom and side padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 65fd3c9..09e7211 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -27,7 +27,6 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml $(call soong_config_set,lyric,tuning_product,cloudripper) $(call soong_config_set,google3a_config,target_device,cloudripper) @@ -94,18 +93,19 @@ PRODUCT_COPY_FILES += \ device/google/pantah/powerhint-cloudripper.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json # Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/pantah/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth -PRODUCT_PACKAGES += \ - bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf + PRODUCT_PROPERTY_OVERRIDES += \ ro.bluetooth.a2dp_offload.supported=true \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.firmware.selection=BCM.hcd + +# default BDADDR for EVB only +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Spatial Audio PRODUCT_PACKAGES += \ @@ -142,10 +142,6 @@ PRODUCT_PACKAGES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/pantah/powerstats/cloudripper @@ -178,9 +174,6 @@ endif PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.firmware.selection=BCM.hcd - # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-panther.mk b/device-panther.mk index 213679b..48f570a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -31,7 +31,6 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml $(call soong_config_set,lyric,tuning_product,panther) $(call soong_config_set,google3a_config,target_device,panther) @@ -122,13 +121,11 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/pantah/powerhint-panther-a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-a0.json -# Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/pantah/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth +# Spatial Audio PRODUCT_PACKAGES += \ - bt_vendor.conf + libspatialaudio + +# Bluetooth HAL PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf PRODUCT_PROPERTY_OVERRIDES += \ @@ -136,10 +133,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus -# Spatial Audio -PRODUCT_PACKAGES += \ - libspatialaudio - # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ hci_inject @@ -157,6 +150,35 @@ PRODUCT_COPY_FILES += \ # Bluetooth SAR test tool PRODUCT_PACKAGES_DEBUG += \ sar_test +# default BDADDR for EVB only +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" + +# Bluetooth LE Audio +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio_offload.supported=true \ + persist.bluetooth.leaudio_offload.disabled=false \ + ro.bluetooth.leaudio_switcher.supported=true + +# Bluetooth EWP test tool +PRODUCT_PACKAGES_DEBUG += \ + ewp_tool + +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.firmware.selection=BCM.hcd + +# Bluetooth AAC VBR +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.a2dp_aac.vbr_supported=true + +# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=262238 +else +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.bqr.event_mask=94 +endif # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ @@ -192,10 +214,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/pantah/powerstats/panther \ @@ -267,16 +285,6 @@ PRODUCT_PACKAGES += \ SettingsOverlayGVU6C \ SettingsOverlayGVU6C_VN -# Bluetooth LE Audio -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=false \ - ro.bluetooth.leaudio_switcher.supported=true - -# Bluetooth EWP test tool -PRODUCT_PACKAGES_DEBUG += \ - ewp_tool - # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ @@ -294,23 +302,6 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.chirp.enabled=1 \ ro.vendor.vibrator.hal.device.mass=0.195 \ ro.vendor.vibrator.hal.loc.coeff=2.65 - -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.firmware.selection=BCM.hcd - -# Bluetooth AAC VBR -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.a2dp_aac.vbr_supported=true - -# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=262238 -else -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask=94 -endif - # Keyboard bottom padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index acaa75f..30cb1e9 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -27,7 +27,6 @@ include device/google/pantah/audio/ravenclaw/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/pantah/device_framework_matrix_product.xml ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),) include device/google/gs101/uwb/uwb.mk include device/google/pantah/uwb/uwb_calibration.mk @@ -92,18 +91,17 @@ PRODUCT_COPY_FILES += \ device/google/pantah/powerhint-ravenclaw.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json # Bluetooth HAL -DEVICE_MANIFEST_FILE += \ - device/google/pantah/bluetooth/manifest_bluetooth.xml -PRODUCT_SOONG_NAMESPACES += \ - vendor/broadcom/bluetooth -PRODUCT_PACKAGES += \ - bt_vendor.conf PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf PRODUCT_PROPERTY_OVERRIDES += \ ro.bluetooth.a2dp_offload.supported=true \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.firmware.selection=BCM.hcd +# default BDADDR for EVB only +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service @@ -135,10 +133,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # ro.hardware.keystore=software \ # ro.hardware.gatekeeper=software -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - # PowerStats HAL PRODUCT_SOONG_NAMESPACES += \ device/google/pantah/powerstats/ravenclaw @@ -179,9 +173,6 @@ endif PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.firmware.selection=BCM.hcd - # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml deleted file mode 100644 index 26436bb..0000000 --- a/device_framework_matrix_product.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - hardware.google.bluetooth.ccc - 1.1 - - IBluetoothCcc - default - - - From 27f229e4e5f2cae931eb09582c70a64ea36ad568 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 6 Sep 2022 12:43:35 +0800 Subject: [PATCH 025/148] use gs-common insert module script Bug: 243763292 Test: boot to home Change-Id: Ie4d200774c5c3340b46c749af3fad4863d3e72b4 --- conf/init.cloudripper.rc | 2 +- conf/init.pantah.rc | 2 +- conf/init.ravenclaw.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc index 8fe9268..566a6e3 100644 --- a/conf/init.cloudripper.rc +++ b/conf/init.cloudripper.rc @@ -15,7 +15,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_cloudripper -service insmod_sh_cloudripper /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.cloudripper.cfg +service insmod_sh_cloudripper /vendor/bin/insmod.sh /vendor/etc/init.insmod.cloudripper.cfg class main user root group root system diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 48abe65..6ecb93d 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -13,7 +13,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_pantah -service insmod_sh_pantah /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_pantah /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/conf/init.ravenclaw.rc b/conf/init.ravenclaw.rc index 70bae17..0482aa6 100644 --- a/conf/init.ravenclaw.rc +++ b/conf/init.ravenclaw.rc @@ -15,7 +15,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_ravenclaw -service insmod_sh_ravenclaw /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.ravenclaw.cfg +service insmod_sh_ravenclaw /vendor/bin/insmod.sh /vendor/etc/init.insmod.ravenclaw.cfg class main user root group root system From b2127a5df104b006918885dd1b0e75e6995de3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Tue, 13 Sep 2022 01:56:01 +0000 Subject: [PATCH 026/148] Set Lyric camera_hardware variable. Bug: 240478511 Test: presubmit Change-Id: I34e6a72252b1606cf93fa7b0f682fc37c16b708e --- device-cheetah.mk | 2 ++ device-cloudripper.mk | 2 ++ device-panther.mk | 2 ++ device-ravenclaw.mk | 2 ++ 4 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index eb5b3d7..9f69170 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -35,6 +35,8 @@ ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) include device/google/pantah/uwb/uwb_calibration.mk endif +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,cheetah) $(call soong_config_set,lyric,tuning_product,cheetah) $(call soong_config_set,google3a_config,target_device,cheetah) diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 09e7211..439310f 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -27,6 +27,8 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,cloudripper) $(call soong_config_set,lyric,tuning_product,cloudripper) $(call soong_config_set,google3a_config,target_device,cloudripper) diff --git a/device-panther.mk b/device-panther.mk index 48f570a..3c4ad3f 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -31,6 +31,8 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,panther) $(call soong_config_set,lyric,tuning_product,panther) $(call soong_config_set,google3a_config,target_device,panther) diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 30cb1e9..eb00889 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -32,6 +32,8 @@ include device/google/gs101/uwb/uwb.mk include device/google/pantah/uwb/uwb_calibration.mk endif +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,ravenclaw) $(call soong_config_set,lyric,tuning_product,cloudripper) $(call soong_config_set,google3a_config,target_device,cloudripper) From c337787e1d8b23703b90931e641982ea0416dae6 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Thu, 15 Sep 2022 11:50:57 +0000 Subject: [PATCH 027/148] Add by project le audio offload capabilities config file We create by project offload capabilities config file to make each project have its own customized default device offload capabilities. Bug: 238983662 Test: make sure file added in config folder can be copied into devices Change-Id: Ibc12a2774d3b32fe54574372121ce3e93d395167 --- .../panther/le_audio_codec_capabilities.xml | 84 +++++++++++++++++++ device-panther.mk | 4 + 2 files changed, 88 insertions(+) create mode 100644 bluetooth/panther/le_audio_codec_capabilities.xml diff --git a/bluetooth/panther/le_audio_codec_capabilities.xml b/bluetooth/panther/le_audio_codec_capabilities.xml new file mode 100644 index 0000000..cfb915b --- /dev/null +++ b/bluetooth/panther/le_audio_codec_capabilities.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device-panther.mk b/device-panther.mk index 3c4ad3f..da3918e 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -162,6 +162,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true +# LE Auido Offload Capabilities setting +PRODUCT_COPY_FILES += \ + device/google/pantah/bluetooth/panther/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool From 364db164bf40d2b09c3a5f043800c88ba19617dc Mon Sep 17 00:00:00 2001 From: chungkai Date: Tue, 12 Jul 2022 10:00:34 +0000 Subject: [PATCH 028/148] Enable load kernel modules in parallel enable load kernel modules in parallel but load some specific modules in sequential Test: reboot more than 5000 times without failure and reduce 250ms(33%) Bug: 229794277 Signed-off-by: chungkai Change-Id: Ic4961389d58b5195d252dff15cbb92bb391caacc --- cheetah/BoardConfig.mk | 8 ++++++++ panther/BoardConfig.mk | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 59a7b9b..2b04c8d 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -13,6 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 + TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cheetah TARGET_SCREEN_DENSITY := 560 diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 07afce2..acf3714 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -13,6 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 + TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := panther TARGET_SCREEN_DENSITY := 420 From b1046f32d532d7ed143ed5ba8cf18086318fc671 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Mon, 19 Sep 2022 03:53:51 +0000 Subject: [PATCH 029/148] Add by project le audio offload capabilities config file We create by project offload capabilities config file to make each project have its own customized default device offload capabilities. Bug: 238983662 Test: make sure file added in config folder can be copied into devices Change-Id: I23ac69ef5770a6e471a70f18205c027f2976af16 --- .../cheetah/le_audio_codec_capabilities.xml | 84 +++++++++++++++++++ device-cheetah.mk | 5 ++ 2 files changed, 89 insertions(+) create mode 100644 bluetooth/cheetah/le_audio_codec_capabilities.xml diff --git a/bluetooth/cheetah/le_audio_codec_capabilities.xml b/bluetooth/cheetah/le_audio_codec_capabilities.xml new file mode 100644 index 0000000..cfb915b --- /dev/null +++ b/bluetooth/cheetah/le_audio_codec_capabilities.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device-cheetah.mk b/device-cheetah.mk index 9f69170..07ce16e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -181,12 +181,17 @@ else PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask=94 endif + # Bluetooth LE Audio PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true +# LE Auido Offload Capabilities setting +PRODUCT_COPY_FILES += \ + device/google/pantah/bluetooth/cheetah/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool From 94f442871ffed2aad106dffd2cc37185ee0e47cc Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:55:22 -0700 Subject: [PATCH 030/148] p10: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: I198e4991e06951e0b324726649c9e967e8aac6fb --- .../overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index f617337..9369361 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -202,11 +202,6 @@ com.google.sensor.quick_pickup - - 34 - 0.335 From 0b07828ad57241602352080047a25eca9898c53a Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:59:00 -0700 Subject: [PATCH 031/148] c10: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: I1ef0a67006d57cafa2e7a74c70b0cd176a094c2d --- .../overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index 3c371ab..8143486 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -180,11 +180,6 @@ com.google.sensor.quick_pickup - - 25 - 0.335 From 9d3f69448431c380deb2b7235e42c5156335c901 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Fri, 22 Jul 2022 10:07:47 -0700 Subject: [PATCH 032/148] Revert "thermal: remove gxp cooling device dependency" This reverts commit af3528b9034a5e590ec1017f9f4b6be4a31d46bb. Re-enable gxp cooling device Bug: 238273184 Test: Build and boot on device Signed-off-by: Sayanna Chandula Change-Id: I6e7eac3f8b15fffccbf64c80f8af7866b9397e4f --- thermal_info_config_cheetah.json | 9 +++++++++ thermal_info_config_panther.json | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 200db05..db7f985 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -129,6 +129,10 @@ { "CdevRequest": "tpu_cooling", "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + }, + { + "CdevRequest": "gxp-cooling", + "LimitInfo": [0, 0, 0, 0, 0, 9, 9] } ] }, @@ -754,6 +758,11 @@ "Name":"tpu_cooling", "Type":"NPU", "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" + }, + { + "Name":"gxp-cooling", + "Type":"NPU", + "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote" } ], "PowerRails":[ diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 66982e8..57174cf 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -129,6 +129,10 @@ { "CdevRequest": "tpu_cooling", "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + }, + { + "CdevRequest": "gxp-cooling", + "LimitInfo": [0, 0, 0, 0, 0, 9, 9] } ] }, @@ -755,6 +759,11 @@ "Name":"tpu_cooling", "Type":"NPU", "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" + }, + { + "Name":"gxp-cooling", + "Type":"NPU", + "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote" } ], "PowerRails":[ From 6f30806b7829bed67896194f8bfe43dbcea21e31 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Thu, 22 Sep 2022 07:02:44 +0000 Subject: [PATCH 033/148] Change config path for LE Audio Capabilities file Since there is no different setting for sub project under same prohject, we will change the setting file from `bluetooth/project/` to `bluetooth/` to simplify the file structure. Bug: 238983662 Test: make sure file added in config folder can be copied into devices Change-Id: I1b0d6a2107f5d69fd7bf650bad314e920810c156 --- .../le_audio_codec_capabilities.xml | 0 .../panther/le_audio_codec_capabilities.xml | 73 ------------------- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 4 files changed, 2 insertions(+), 75 deletions(-) rename bluetooth/{cheetah => }/le_audio_codec_capabilities.xml (100%) delete mode 100644 bluetooth/panther/le_audio_codec_capabilities.xml diff --git a/bluetooth/cheetah/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml similarity index 100% rename from bluetooth/cheetah/le_audio_codec_capabilities.xml rename to bluetooth/le_audio_codec_capabilities.xml diff --git a/bluetooth/panther/le_audio_codec_capabilities.xml b/bluetooth/panther/le_audio_codec_capabilities.xml deleted file mode 100644 index a836273..0000000 --- a/bluetooth/panther/le_audio_codec_capabilities.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/device-cheetah.mk b/device-cheetah.mk index fd97aef..f19be26 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -190,7 +190,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ - device/google/pantah/bluetooth/cheetah/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ diff --git a/device-panther.mk b/device-panther.mk index 15a4135..64a0162 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -164,7 +164,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ - device/google/pantah/bluetooth/panther/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml + device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ From 7cbd31cb53847fe5f56e6e51859117ca789f2d10 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 26 Sep 2022 13:59:13 +0900 Subject: [PATCH 034/148] Skip AVF benchmark on EVT1.0 devices Because running benchmarks both on EVT1.0 devices and later devices cause benchmark noises. Bug: 248386237 Test: atest MicrodroidBenchmarks Change-Id: Ib50058e3fe84f388409473efe84096b0ef4b72e9 --- conf/init.panther.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.panther.rc b/conf/init.panther.rc index d786cf3..5d36c84 100644 --- a/conf/init.panther.rc +++ b/conf/init.panther.rc @@ -18,3 +18,6 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet # it should be written by the system init. on property:ro.boot.hardware.sku=G03Z5 setprop audio.camerasound.force true + +on property:ro.boot.revision=EVT1.0 + setprop debug.avf.benchmark.skip true From 3d9bff5dd529b46802e2c6ff84f395b863b8b5a7 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 26 Sep 2022 08:43:29 +0000 Subject: [PATCH 035/148] Revert "Skip AVF benchmark on EVT1.0 devices" This reverts commit 7cbd31cb53847fe5f56e6e51859117ca789f2d10. Reason for revert: ag/20024596 Change-Id: Id72ed0197c7e8eeac44c7cadfd9d3591bce5a32b --- conf/init.panther.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/init.panther.rc b/conf/init.panther.rc index 5d36c84..d786cf3 100644 --- a/conf/init.panther.rc +++ b/conf/init.panther.rc @@ -18,6 +18,3 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet # it should be written by the system init. on property:ro.boot.hardware.sku=G03Z5 setprop audio.camerasound.force true - -on property:ro.boot.revision=EVT1.0 - setprop debug.avf.benchmark.skip true From 81a3038eee816e0d7c17f93d53f0dc3bc5179591 Mon Sep 17 00:00:00 2001 From: Anthony Stange Date: Tue, 18 Oct 2022 13:42:59 +0000 Subject: [PATCH 036/148] Add OnChipAccMask to gps.xml Bug: 249751526 Test: b/249751526#comment3 Change-Id: Ifdde9cca4dc4aadb6d474c225994bb604a6d39de --- location/gps.xml | 1 + location/gps.xml.c10 | 1 + location/gps.xml.p10 | 1 + location/gps_user.xml | 1 + location/gps_user.xml.c10 | 1 + location/gps_user.xml.p10 | 1 + 6 files changed, 6 insertions(+) diff --git a/location/gps.xml b/location/gps.xml index ab21290..a205235 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -87,6 +87,7 @@ EnableOnChipStopNotification="2" PowerMode="3" MinGpsWeekNumber="2216" + OnChipAccMask="50" /> Date: Wed, 19 Oct 2022 11:38:51 +0800 Subject: [PATCH 037/148] Remove obsolete source of sensor of pantah. These files are not used anymore, removed them. Bug: 245007498 Test: build pass and check the build on C10. Change-Id: I157e9cef834db65e9e0ea5c0173bc3b93665a8e6 Signed-off-by: emilchung --- sensors/Android.mk | 30 --- sensors/sensors_dummy.c | 409 ---------------------------------------- 2 files changed, 439 deletions(-) delete mode 100644 sensors/Android.mk delete mode 100644 sensors/sensors_dummy.c diff --git a/sensors/Android.mk b/sensors/Android.mk deleted file mode 100644 index 6e22d41..0000000 --- a/sensors/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -# HAL module implemenation stored in -# hw/..so -include $(CLEAR_VARS) - -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware -LOCAL_SRC_FILES := sensors_dummy.c -LOCAL_MODULE := sensors.cloudripper -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE -LOCAL_PROPRIETARY_MODULE := true - -include $(BUILD_SHARED_LIBRARY) diff --git a/sensors/sensors_dummy.c b/sensors/sensors_dummy.c deleted file mode 100644 index b1edd56..0000000 --- a/sensors/sensors_dummy.c +++ /dev/null @@ -1,409 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* this implements a sensors hardware library for the Android emulator. - * the following code should be built as a shared library that will be - * placed into /system/lib/hw/sensors.goldfish.so - * - * it will be loaded by the code in hardware/libhardware/hardware.c - * which is itself called from com_android_server_SensorService.cpp - */ - -#define SENSORS_SERVICE_NAME "sensors" - -#define LOG_TAG "Dummy_Sensors" - -#include -#include -#include -#include -#include -#include -#include -#include - -#if 0 -#define D(...) ALOGD(__VA_ARGS__) -#else -#define D(...) ((void)0) -#endif - -#define E(...) ALOGE(__VA_ARGS__) - -/** SENSOR IDS AND NAMES - **/ - -#define MAX_NUM_SENSORS 8 - -#define SUPPORTED_SENSORS ((1<"; -} - -static int -_sensorIdFromName( const char* name ) -{ - int nn; - - if (name == NULL) - return -1; - - for (nn = 0; nn < MAX_NUM_SENSORS; nn++) - if (!strcmp(name, _sensorIds[nn].name)) - return _sensorIds[nn].id; - - return -1; -} - -/* return the current time in nanoseconds */ -static int64_t now_ns(void) { - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - return (int64_t)ts.tv_sec * 1000000000 + ts.tv_nsec; -} - -/** SENSORS POLL DEVICE - ** - ** This one is used to read sensor data from the hardware. - ** We implement this by simply reading the data from the - ** emulator through the QEMUD channel. - **/ - -typedef struct SensorDevice { - struct sensors_poll_device_1 device; - sensors_event_t sensors[MAX_NUM_SENSORS]; - uint32_t pendingSensors; - int64_t timeStart; - int64_t timeOffset; - uint32_t active_sensors; - int fd; - pthread_mutex_t lock; -} SensorDevice; - -/* Grab the file descriptor to the emulator's sensors service pipe. - * This function returns a file descriptor on success, or -errno on - * failure, and assumes the SensorDevice instance's lock is held. - * - * This is needed because set_delay(), poll() and activate() can be called - * from different threads, and poll() is blocking. - * - * 1) On a first thread, de-activate() all sensors first, then call poll(), - * which results in the thread blocking. - * - * 2) On a second thread, slightly later, call set_delay() then activate() - * to enable the acceleration sensor. - * - * The system expects this to unblock the first thread which will receive - * new sensor events after the activate() call in 2). - * - * This cannot work if both threads don't use the same connection. - * - * TODO(digit): This protocol is brittle, implement another control channel - * for set_delay()/activate()/batch() when supporting HAL 1.3 - */ -static int sensor_device_get_fd_locked(SensorDevice* dev) { - /* Create connection to service on first call */ - if (dev->fd < 0) { - int ret = -errno; - E("%s: Could not open connection to service: %s", __FUNCTION__, - strerror(-ret)); - return ret; - } - return dev->fd; -} - -/* Pick up one pending sensor event. On success, this returns the sensor - * id, and sets |*event| accordingly. On failure, i.e. if there are no - * pending events, return -EINVAL. - * - * Note: The device's lock must be acquired. - */ -static int sensor_device_pick_pending_event_locked(SensorDevice* d, - sensors_event_t* event) -{ - uint32_t mask = SUPPORTED_SENSORS & d->pendingSensors; - - if (mask) { - uint32_t i = 31 - __builtin_clz(mask); - - pthread_mutex_lock(&d->lock); - d->pendingSensors &= ~(1U << i); - *event = d->sensors[i]; - event->sensor = i; - event->version = sizeof(*event); - pthread_mutex_unlock(&d->lock); - D("%s: %d [%f, %f, %f]", __FUNCTION__, - i, - event->data[0], - event->data[1], - event->data[2]); - return i; - } - E("No sensor to return!!! pendingSensors=0x%08x", d->pendingSensors); - // we may end-up in a busy loop, slow things down, just in case. - usleep(1000); - return -EINVAL; -} - -static int sensor_device_close(struct hw_device_t* dev0) -{ - SensorDevice* dev = (void*)dev0; - // Assume that there are no other threads blocked on poll() - if (dev->fd >= 0) { - close(dev->fd); - dev->fd = -1; - } - pthread_mutex_destroy(&dev->lock); - free(dev); - return 0; -} - -/* Return an array of sensor data. This function blocks until there is sensor - * related events to report. On success, it will write the events into the - * |data| array, which contains |count| items. The function returns the number - * of events written into the array, which shall never be greater than |count|. - * On error, return -errno code. - * - * Note that according to the sensor HAL [1], it shall never return 0! - * - * [1] http://source.android.com/devices/sensors/hal-interface.html - */ -static int sensor_device_poll(struct sensors_poll_device_t *dev0, - sensors_event_t* data, int count) -{ - return -EIO; -} - -static int sensor_device_activate(struct sensors_poll_device_t *dev0, - int handle, - int enabled) -{ - SensorDevice* dev = (void*)dev0; - - D("%s: handle=%s (%d) enabled=%d", __FUNCTION__, - _sensorIdToName(handle), handle, enabled); - - /* Sanity check */ - if (!ID_CHECK(handle)) { - E("%s: bad handle ID", __FUNCTION__); - return -EINVAL; - } - - /* Exit early if sensor is already enabled/disabled. */ - uint32_t mask = (1U << handle); - uint32_t sensors = enabled ? mask : 0; - - pthread_mutex_lock(&dev->lock); - - uint32_t active = dev->active_sensors; - uint32_t new_sensors = (active & ~mask) | (sensors & mask); - uint32_t changed = active ^ new_sensors; - - if (changed) - dev->active_sensors = new_sensors; - - pthread_mutex_unlock(&dev->lock); - return 0; -} - -static int sensor_device_default_flush( - struct sensors_poll_device_1* dev0, - int handle) { - - SensorDevice* dev = (void*)dev0; - - D("%s: handle=%s (%d)", __FUNCTION__, - _sensorIdToName(handle), handle); - - /* Sanity check */ - if (!ID_CHECK(handle)) { - E("%s: bad handle ID", __FUNCTION__); - return -EINVAL; - } - - pthread_mutex_lock(&dev->lock); - dev->sensors[handle].version = META_DATA_VERSION; - dev->sensors[handle].type = SENSOR_TYPE_META_DATA; - dev->sensors[handle].sensor = 0; - dev->sensors[handle].timestamp = 0; - dev->sensors[handle].meta_data.what = META_DATA_FLUSH_COMPLETE; - dev->pendingSensors |= (1U << handle); - pthread_mutex_unlock(&dev->lock); - - return 0; -} - -static int sensor_device_set_delay(struct sensors_poll_device_t *dev0, - int handle __unused, - int64_t ns) -{ - return 0; -} - -static int sensor_device_default_batch( - struct sensors_poll_device_1* dev, - int sensor_handle, - int flags, - int64_t sampling_period_ns, - int64_t max_report_latency_ns) { - return sensor_device_set_delay(dev, sensor_handle, sampling_period_ns); -} - -/** MODULE REGISTRATION SUPPORT - ** - ** This is required so that hardware/libhardware/hardware.c - ** will dlopen() this library appropriately. - **/ - -/* - * the following is the list of all supported sensors. - * this table is used to build sSensorList declared below - * according to which hardware sensors are reported as - * available from the emulator (see get_sensors_list below) - * - * note: numerical values for maxRange/resolution/power for - * all sensors but light, pressure and humidity were - * taken from the reference AK8976A implementation - */ -static const struct sensor_t sSensorListInit[] = { - { .name = "Accelerometer", - .vendor = "The Android Open Source Project", - .version = 1, - .handle = ID_ACCELERATION, - .type = SENSOR_TYPE_ACCELEROMETER, - .maxRange = 2.8f, - .resolution = 1.0f/4032.0f, - .power = 3.0f, - .minDelay = 10000, - .maxDelay = 60 * 1000 * 1000, - .fifoReservedEventCount = 0, - .fifoMaxEventCount = 0, - .stringType = 0, - .requiredPermission = 0, - .flags = SENSOR_FLAG_CONTINUOUS_MODE, - .reserved = {} - }, -}; - -static struct sensor_t sSensorList[1]; - -static int sensors__get_sensors_list(struct sensors_module_t* module __unused, - struct sensor_t const** list) -{ - *list = sSensorList; - - return 0; -} - -static int -open_sensors(const struct hw_module_t* module, - const char* name, - struct hw_device_t* *device) -{ - int status = -EINVAL; - - D("%s: name=%s", __FUNCTION__, name); - - if (!strcmp(name, SENSORS_HARDWARE_POLL)) { - SensorDevice *dev = malloc(sizeof(*dev)); - - memset(dev, 0, sizeof(*dev)); - - dev->device.common.tag = HARDWARE_DEVICE_TAG; - dev->device.common.version = SENSORS_DEVICE_API_VERSION_1_3; - dev->device.common.module = (struct hw_module_t*) module; - dev->device.common.close = sensor_device_close; - dev->device.poll = sensor_device_poll; - dev->device.activate = sensor_device_activate; - dev->device.setDelay = sensor_device_set_delay; - - // Version 1.3-specific functions - dev->device.batch = sensor_device_default_batch; - dev->device.flush = sensor_device_default_flush; - - dev->fd = -1; - pthread_mutex_init(&dev->lock, NULL); - - *device = &dev->device.common; - status = 0; - } - return status; -} - - -static struct hw_module_methods_t sensors_module_methods = { - .open = open_sensors -}; - -struct sensors_module_t HAL_MODULE_INFO_SYM = { - .common = { - .tag = HARDWARE_MODULE_TAG, - .version_major = 1, - .version_minor = 0, - .id = SENSORS_HARDWARE_MODULE_ID, - .name = "Dummy SENSORS Module", - .author = "The Android Open Source Project", - .methods = &sensors_module_methods, - }, - .get_sensors_list = sensors__get_sensors_list -}; From 0be2bc49ae6cb9b0be0228eeb1dff9a91e585174 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 16 Nov 2022 13:36:47 +0800 Subject: [PATCH 038/148] use syna setting from gs-common Bug: 256521567 Test: adb bugreport Change-Id: I209337cd8880187533953b68a7405f30fd6c6ee3 --- device-cheetah.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 6bf1e57..f5c0087 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -30,6 +30,7 @@ include device/google/pantah/audio/cheetah/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/syna/syna.mk ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) include device/google/pantah/uwb/uwb_calibration.mk From 0a6a3e1f898fe40b3f2275e5281b723bf5fc18a5 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 18 Nov 2022 13:07:27 +0800 Subject: [PATCH 039/148] include focaltech setting from gs-common Bug: 256521567 Test: adb bugreport Change-Id: Ic57d0f0e32afbc8b706f60004509f38e7855c032 --- conf/init.pantah.rc | 21 --------------------- conf/init.panther.rc | 7 ------- device-panther.mk | 1 + 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 6ecb93d..b6517f6 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -87,27 +87,6 @@ on property:ro.boot.hardware.revision=PROTO1.0 on property:ro.boot.hardware.revision=PROTO1.1 setprop vendor.thermal.config "thermal_info_config_proto.json" -# Touch -on property:vendor.device.modules.ready=1 - chown system system /proc/focaltech_touch/Channel_Num - chown system system /proc/focaltech_touch/FW_Version - chown system system /proc/focaltech_touch/INT_PIN - chown system system /proc/focaltech_touch/force_active - chown system system /proc/focaltech_touch/Reset_Pin - chown system system /proc/focaltech_touch/fw_grip - chown system system /proc/focaltech_touch/fw_palm - chown system system /proc/focaltech_touch/heatmap_onoff - chown system system /proc/focaltech_touch/mf_mode - chown system system /proc/focaltech_touch/selftest/Baseline - chown system system /proc/focaltech_touch/selftest/Noise - chown system system /proc/focaltech_touch/selftest/Panel_Differ - chown system system /proc/focaltech_touch/selftest/Rawdata - chown system system /proc/focaltech_touch/selftest/Rawdata_Uniformity - chown system system /proc/focaltech_touch/selftest/Scap_CB - chown system system /proc/focaltech_touch/selftest/Scap_Rawdata - chown system system /proc/focaltech_touch/selftest/Short - chown system system /proc/focaltech_touch/selftest/Strength - # 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 diff --git a/conf/init.panther.rc b/conf/init.panther.rc index d786cf3..2e78ee9 100644 --- a/conf/init.panther.rc +++ b/conf/init.panther.rc @@ -6,13 +6,6 @@ on property:vendor.device.modules.ready=1 # Start the twoshay touch service start twoshay -# Toggle glove_mode according to touch_sensitivity_mode -on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1 - write /proc/focaltech_touch/high_sensitivity 0 - -on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1 - write /proc/focaltech_touch/high_sensitivity 1 - # For Japan sku, always enforce camera shutter sound # Since this property is read by the audio server in system service, # it should be written by the system init. diff --git a/device-panther.mk b/device-panther.mk index f38a7ea..ea9f44d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -30,6 +30,7 @@ include device/google/pantah/audio/panther/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/focaltech/focaltech.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,panther) From 696fe651a198404026d5ccc14048a385d7de8b5b Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 29 Nov 2022 09:53:18 +0800 Subject: [PATCH 040/148] use syna setting from gs-common Bug: 256521567 Test: adb bugreport Change-Id: I71d8041ba57c78a7b5eba3688ba366735f0739e5 --- device-cloudripper.mk | 1 + device-ravenclaw.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 1582fe1..447bf2a 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -26,6 +26,7 @@ include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/syna/syna.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,cloudripper) diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index eb00889..2fcef30 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -26,6 +26,7 @@ include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/ravenclaw/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/syna/syna.mk ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),) include device/google/gs101/uwb/uwb.mk From 76cd95d6df04fd6fe963baf65d3428ffb599e087 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 30 Nov 2022 09:52:01 +0800 Subject: [PATCH 041/148] correct touch setting Bug: 256521567 Test: build pass Change-Id: Id292feeecb0642d643bdb5eefe6d3f171a9a6fa9 --- device-ravenclaw.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 2fcef30..b3607e7 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -26,7 +26,7 @@ include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/ravenclaw/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/syna/syna.mk +include device/google/gs-common/touch/lsi/lsi.mk ifeq ($(filter factory_ravenclaw, $(TARGET_PRODUCT)),) include device/google/gs101/uwb/uwb.mk From f1424b2c038699b39595ac94bf7468a0ca77bd03 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Wed, 14 Sep 2022 11:40:58 +0800 Subject: [PATCH 042/148] Add display shape config for C10, P10 Bug: 236935288 Test: make Change-Id: I170bae8b12ee77ef2014ca373707595289b7daca --- .../frameworks/base/core/res/res/values/config.xml | 13 +++++++++++++ .../frameworks/base/core/res/res/values/config.xml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index bc57313..fea7a7e 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -298,4 +298,17 @@ Note: This should be only enabled on devices with high confidence on power measurement. --> true + + + M 120.63086 0 C 111.97487 9.2518493e-17 103.41184 -0.00022182194 94.755859 0.091796875 C 86.099865 0.18380821 77.536566 0.46005475 68.972656 1.65625 C 51.568581 4.0486395 35.637425 10.122024 22.929688 22.912109 C 10.129864 35.610181 3.9606178 51.529084 1.5664062 68.919922 C 0.36930055 77.477315 0.092085137 86.034182 0 94.683594 L 0 3025.3164 C 0.092089816 3033.9658 0.3692987 3042.5227 1.5664062 3051.0801 C 3.9606216 3068.471 10.129872 3084.3898 22.929688 3097.0879 C 35.637432 3109.878 51.568582 3115.9514 68.972656 3118.3438 C 77.53656 3119.5398 86.099868 3119.8162 94.755859 3119.9082 C 103.41184 3120.0002 111.97487 3120 120.63086 3120 L 1319.3691 3120 C 1328.0252 3120 1336.5881 3120.0002 1345.2441 3119.9082 C 1353.9001 3119.8162 1362.4635 3119.5398 1371.0273 3118.3438 C 1388.4314 3115.9514 1404.3625 3109.878 1417.0703 3097.0879 C 1429.8701 3084.3898 1436.0412 3068.471 1438.4355 3051.0801 C 1439.6326 3042.5227 1439.9079 3033.9658 1440 3025.3164 L 1440 94.683594 C 1439.9079 86.03418 1439.6326 77.477314 1438.4355 68.919922 C 1436.0412 51.529083 1429.8701 35.610181 1417.0703 22.912109 C 1404.3625 10.122024 1388.4314 4.0486392 1371.0273 1.65625 C 1362.4635 0.4600554 1353.9001 0.18380669 1345.2441 0.091796875 C 1336.5881 -0.00022294096 1328.0251 0 1319.3691 0 L 120.63086 0 z diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index 30a508b..b9a028d 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -315,4 +315,17 @@ Note: This should be only enabled on devices with high confidence on power measurement. --> true + + + M 75.769531 0 C 70.332709 -9.2518493e-18 64.952449 0.00079919532 59.515625 0.05859375 C 54.078801 0.11638831 48.699297 0.28968642 43.320312 1.0410156 C 32.388827 2.5436742 22.384063 6.3571816 14.402344 14.390625 C 6.3627864 22.366274 2.486224 32.36589 0.98242188 43.289062 C 0.23052083 48.663956 0.057838542 54.038015 0 59.470703 L 0 2340.5293 C 0.057838884 2345.962 0.23052038 2351.336 0.98242188 2356.7109 C 2.4862239 2367.6341 6.3627861 2377.6338 14.402344 2385.6094 C 22.384063 2393.6429 32.388834 2397.4563 43.320312 2398.959 C 48.699302 2399.7103 54.078805 2399.8834 59.515625 2399.9414 C 64.952444 2399.9994 70.332714 2400 75.769531 2400 L 1004.2305 2400 C 1009.6673 2400 1015.0476 2399.9994 1020.4844 2399.9414 C 1025.9213 2399.8834 1031.3008 2399.7103 1036.6797 2398.959 C 1047.6113 2397.4563 1057.6159 2393.6429 1065.5977 2385.6094 C 1073.6371 2377.6338 1077.5138 2367.6341 1079.0176 2356.7109 C 1079.7695 2351.336 1079.9422 2345.962 1080 2340.5293 L 1080 59.470703 C 1079.9422 54.038015 1079.7695 48.663956 1079.0176 43.289062 C 1077.5138 32.36589 1073.637 22.366274 1065.5977 14.390625 C 1057.6159 6.3571811 1047.6112 2.5436742 1036.6797 1.0410156 C 1031.3007 0.28968666 1025.9213 0.11639363 1020.4844 0.05859375 C 1015.0476 0.00080386558 1009.6673 0 1004.2305 0 L 75.769531 0 z From ac3a1494cc1063aeee01d6db087a5e860481fbd2 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 9 Dec 2022 01:42:40 +0000 Subject: [PATCH 043/148] uwb(c10): Add UWB framework overlays rro app Bug: 261908320 Test: Compiles Change-Id: I1df237bca76ff1ded2669a857c0bf2023fde2752 --- cheetah/rro_overlays/UwbOverlay/Android.bp | 18 +++++++++++++ .../UwbOverlay/AndroidManifest.xml | 27 +++++++++++++++++++ cheetah/rro_overlays/UwbOverlay/OWNERS | 3 +++ .../UwbOverlay/res/values/config.xml | 20 ++++++++++++++ device-cheetah.mk | 2 +- 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 cheetah/rro_overlays/UwbOverlay/Android.bp create mode 100644 cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml create mode 100644 cheetah/rro_overlays/UwbOverlay/OWNERS create mode 100644 cheetah/rro_overlays/UwbOverlay/res/values/config.xml diff --git a/cheetah/rro_overlays/UwbOverlay/Android.bp b/cheetah/rro_overlays/UwbOverlay/Android.bp new file mode 100644 index 0000000..a6156ea --- /dev/null +++ b/cheetah/rro_overlays/UwbOverlay/Android.bp @@ -0,0 +1,18 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "//device/google/pantah:device_google_pantah_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "//device/google/pantah/cheetah:device_google_pantah_license", + ], +} + +runtime_resource_overlay { + name: "UwbOverlayC10", + theme: "UwbOverlayC10", + certificate: "platform", + sdk_version: "current", + product_specific: true +} diff --git a/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml b/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml new file mode 100644 index 0000000..57dfd5b --- /dev/null +++ b/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cheetah/rro_overlays/UwbOverlay/OWNERS b/cheetah/rro_overlays/UwbOverlay/OWNERS new file mode 100644 index 0000000..2395d7f --- /dev/null +++ b/cheetah/rro_overlays/UwbOverlay/OWNERS @@ -0,0 +1,3 @@ +# People who can approve changes for submission +include platform/packages/modules/Uwb:/OWNERS +victorliu@google.com diff --git a/cheetah/rro_overlays/UwbOverlay/res/values/config.xml b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml new file mode 100644 index 0000000..7a77d32 --- /dev/null +++ b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml @@ -0,0 +1,20 @@ + + + + diff --git a/device-cheetah.mk b/device-cheetah.mk index 6e88c98..c42442b 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -258,8 +258,8 @@ else include device/google/gs101/fingerprint/udfps_factory.mk endif -# WiFi Overlay PRODUCT_PACKAGES += \ + UwbOverlayC10 \ WifiOverlay2022_C10 PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ From 0bc040f52e73936a81abfe6545e3352d8e3b2427 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Wed, 9 Nov 2022 10:54:19 +0000 Subject: [PATCH 044/148] Enable quick start for pixel devices Bug: 246218540 Test: build pass with `m -j` command Change-Id: I3b18242aab043dbc637ca2169be27bcc0e3a0128 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index c42442b..aa71b56 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -358,3 +358,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ # Virtual fingerprint HAL PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example + +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ diff --git a/device-panther.mk b/device-panther.mk index c7f9b10..83ff517 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -341,3 +341,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ # Virtual fingerprint HAL PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example + +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ From 69e68ee6c44e14ceeff1a826c3a629f0caf9d76a Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Sat, 10 Dec 2022 14:21:12 +0000 Subject: [PATCH 045/148] WLC: Include the wireless_charger from gs-common Bug: 237600973 Change-Id: Iaabbc057f697824b01d20de2b52f9cbab12acf44 Signed-off-by: Ken Yang --- device-cheetah.mk | 1 + device-cloudripper.mk | 1 + device-panther.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 9d2ca76..9638e2e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -31,6 +31,7 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna.mk +include device/google/gs-common/wireless_charger/wireless_charger.mk ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) include device/google/pantah/uwb/uwb_calibration.mk diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 447bf2a..fb6716f 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -27,6 +27,7 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna.mk +include device/google/gs-common/wireless_charger/wireless_charger.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,cloudripper) diff --git a/device-panther.mk b/device-panther.mk index bb08046..73232bc 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -31,6 +31,7 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/focaltech/focaltech.mk +include device/google/gs-common/wireless_charger/wireless_charger.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,panther) From 0204c4d0ef2d1f7f60598331daad4735edf3adf5 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Tue, 6 Dec 2022 22:01:14 +0000 Subject: [PATCH 046/148] Disable HWUI adpf by default and enable in device.mk * Make HWUI disabled by default for vendors * Explicitly enable in supported devices * Consolidate flags for HWUI and SF Bug: b/261628396 Test: manual Change-Id: Ifda3bfcfdd38a7c2b23b2573e29ad974fe159683 --- device-cheetah.mk | 4 ---- device-panther.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 9638e2e..0410e14 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -357,10 +357,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Enable adpf cpu hint session for SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - debug.sf.enable_adpf_cpu_hint=true - # Virtual fingerprint HAL PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example diff --git a/device-panther.mk b/device-panther.mk index 73232bc..b345e8d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -340,10 +340,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Enable adpf cpu hint session for SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - debug.sf.enable_adpf_cpu_hint=true - # Virtual fingerprint HAL PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example From 0f8e36b8e7af2841cf582b32d09e9d1155f89be1 Mon Sep 17 00:00:00 2001 From: Luke Chang Date: Thu, 24 Nov 2022 01:14:51 +0800 Subject: [PATCH 047/148] powerhint: add CPU_LOAD_RESET rule Set minimum mif freq for 1st frame to avoid memlat can't reflect in time. Test: Build and check 1st frame boost Bug: 259275437 Bug: 263383561 Change-Id: I490a82410e5347621a5a59df4440613e540f1876 Signed-off-by: Luke Chang --- powerhint-cheetah-a0.json | 6 ++++++ powerhint-cheetah.json | 6 ++++++ powerhint-panther-a0.json | 6 ++++++ powerhint-panther.json | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 7a37158..c92e892 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -717,6 +717,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 7223fa2..09b898b 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -776,6 +776,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index c638dd5..6744496 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -706,6 +706,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", diff --git a/powerhint-panther.json b/powerhint-panther.json index 3c1b93c..d1389e7 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -745,6 +745,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", From b9295b39daeb2146c8a856506af998b43d1ab72c Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Wed, 4 Jan 2023 10:07:49 -0800 Subject: [PATCH 048/148] Enable DTIM multiplier config Enable DTIM multiplier configuration in Pixels. Bug: 259554744 Test: manual Change-Id: Ie00e0f53ada6b67b20a0c6689874966c832966a1 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 4 ++++ panther/rro_overlays/WifiOverlay/res/values/config.xml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index b6f52e6..70bdfb9 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -150,4 +150,8 @@ true + + + true diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index dac7453..71a135e 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -151,4 +151,7 @@ true + + true From 2d0fac81297c67db56635d73642f75759715fe43 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Fri, 6 Jan 2023 19:30:53 +0000 Subject: [PATCH 049/148] WLC: Remove wireless_charger service Bug: 264624634 Bug: 263830018 Change-Id: Id27579b7fa85991665dee65c7d74d0dea8f7c07c Signed-off-by: Ken Yang --- device-cheetah.mk | 1 - device-cloudripper.mk | 1 - device-panther.mk | 1 - 3 files changed, 3 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 8fef6e8..fea8802 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -31,7 +31,6 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna.mk -include device/google/gs-common/wireless_charger/wireless_charger.mk ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) include device/google/pantah/uwb/uwb_calibration.mk diff --git a/device-cloudripper.mk b/device-cloudripper.mk index fb6716f..447bf2a 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -27,7 +27,6 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/syna/syna.mk -include device/google/gs-common/wireless_charger/wireless_charger.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,cloudripper) diff --git a/device-panther.mk b/device-panther.mk index 265a153..c481434 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -31,7 +31,6 @@ include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/focaltech/focaltech.mk -include device/google/gs-common/wireless_charger/wireless_charger.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,panther) From 6b552fa9f5f89d5fc39cee0fd42a2e5e81f4e85e Mon Sep 17 00:00:00 2001 From: Chungkai Mei Date: Thu, 5 Jan 2023 12:46:04 +0000 Subject: [PATCH 050/148] Load vh_sched kernel module in parallel Bug: 237232510 Change-Id: I57c5580d8906fafd6da600ecac0e4353f154d15f Signed-off-by: Chungkai Mei --- cheetah/BoardConfig.mk | 1 - panther/BoardConfig.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 2b04c8d..5880d5b 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -18,7 +18,6 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential -BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index acf3714..885b3fa 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -18,7 +18,6 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential -BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt From 80f23f6d2072b277c84be7d0185bd3f6d7da6f5c Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Thu, 5 Jan 2023 05:22:46 +0000 Subject: [PATCH 051/148] Enable WM Extensions on Pixel 7 Bug: 266196089 Change-Id: I483eb3ee9106c90ee68f1c656d7b61bcd98d829f --- device-cheetah.mk | 3 +++ device-panther.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 0fbb3b1..7fba79f 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -362,3 +362,6 @@ PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.exampl # Setup Wizard device-specific settings PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-panther.mk b/device-panther.mk index b9561be..c065c17 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -345,3 +345,6 @@ PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.exampl # Setup Wizard device-specific settings PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From 136fe8714d05ae422328390f2235379ab5410e05 Mon Sep 17 00:00:00 2001 From: "[1;5C" Date: Wed, 12 Oct 2022 13:09:06 -0700 Subject: [PATCH 052/148] Change boardconfig layout to support _car builds New layout will make DPI work for _car builds bug: 253279350 Test: Local build and boot Change-Id: I5971e53446a45ac7f2eef579ea802799b41104c9 --- panther/BoardConfig.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 885b3fa..d8b7444 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -20,9 +20,14 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +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/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := panther -TARGET_SCREEN_DENSITY := 420 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true BOARD_KERNEL_CMDLINE += swiotlb=noforce From df622bda138c970e053fa862a0adfb8749bd36b6 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 1 Feb 2023 18:04:39 +0800 Subject: [PATCH 053/148] [NFC] Set tag_intent_app_pref_supported Bug: 244272155 Test: atest android.permission.cts.NfcPermissionTest Test: atest NfcFeatureFlagTest Change-Id: I7e3828d90efedfe9f32bf0c174f5a4279ea8bcb9 --- cheetah/overlay/packages/apps/Nfc/res/values/config.xml | 1 + panther/overlay/packages/apps/Nfc/res/values/config.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/cheetah/overlay/packages/apps/Nfc/res/values/config.xml b/cheetah/overlay/packages/apps/Nfc/res/values/config.xml index bb01504..659fb5a 100644 --- a/cheetah/overlay/packages/apps/Nfc/res/values/config.xml +++ b/cheetah/overlay/packages/apps/Nfc/res/values/config.xml @@ -21,4 +21,5 @@ GE2AE GFE4J + true diff --git a/panther/overlay/packages/apps/Nfc/res/values/config.xml b/panther/overlay/packages/apps/Nfc/res/values/config.xml index 551d19e..ec07493 100644 --- a/panther/overlay/packages/apps/Nfc/res/values/config.xml +++ b/panther/overlay/packages/apps/Nfc/res/values/config.xml @@ -21,4 +21,5 @@ GVU6C G03Z5 + true From cf2f343e6c1890ca06788170e3ccf5d7e4d07f3e Mon Sep 17 00:00:00 2001 From: Kris Chen Date: Wed, 1 Feb 2023 16:34:55 +0800 Subject: [PATCH 054/148] Set `/dev/goodix_fp` permission on early-boot Bug: 264497933 Test: Passed PtsFingerprintTest#udfpsHalStateCheck. Change-Id: I13115a47c1485b2cbc2eef0461bd46287b233194 --- conf/init.pantah.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index b6517f6..3f99a48 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -26,7 +26,6 @@ on property:vendor.mfgapi.touchpanel.permission=1 # Fingerprint on post-fs-data - chown system system /dev/goodix_fp exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app # Overrides fingerprint antispoof if following persist sysprops are set From 368a992ed9cae3638b900854e7720d468a548aaf Mon Sep 17 00:00:00 2001 From: Patty Huang Date: Tue, 31 Jan 2023 14:16:08 +0800 Subject: [PATCH 055/148] Apply the workaround for the CIS->SCO handover Set the system property persist.bluetooth.leaudio.notify.idle.during.call to true to receive the notification when LeAudio group turned idle Bug: 262323299 Test: Switch LE Audio device to HFP device during phone call, and make sure the HFP device can hear sound and don't have buzzing sound. Change-Id: I17b465993f8cc6baffcccf0e15102cf21d1df4c7 --- device-cheetah.mk | 6 ++++++ device-panther.mk | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 7a397c5..b36c7c7 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -195,6 +195,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true +# Bluetooth LE Audio CIS handover to SCO +# Set the property only if the controller doesn't support CIS and SCO +# simultaneously. More details in b/242908683. +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.notify.idle.during.call=true + # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml diff --git a/device-panther.mk b/device-panther.mk index f412ad3..56f806f 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -167,6 +167,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true +# Bluetooth LE Audio CIS handover to SCO +# Set the property only if the controller doesn't support CIS and SCO +# simultaneously. More details in b/242908683. +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.notify.idle.during.call=true + # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml From 2f10cf56729c26e3469b0a1ea29b8202361c7c3d Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Wed, 18 Jan 2023 17:01:59 +0800 Subject: [PATCH 056/148] conf: setup vibrator permission and init cs40l26 HAL Move from hardware/google/pixel/vibrator/cs40l26/ Bug: 264625320 Test: HAL init properly. Change-Id: Ib29f8349c9fa76bd746d61538270e18d5334976e --- conf/init.cloudripper.rc | 34 ++++++++++++++++++++++++++++++++++ conf/init.pantah.rc | 21 +++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc index 566a6e3..dc2ff6c 100644 --- a/conf/init.cloudripper.rc +++ b/conf/init.cloudripper.rc @@ -51,3 +51,37 @@ on post-fs-data setprop wifi.direct.interface p2p-dev-wlan0 setprop wifi.aware.interface aware_nmi0 +# Haptics +on property:vendor.all.modules.ready=1 + mkdir /mnt/vendor/persist/haptics 0770 system system + chmod 770 /mnt/vendor/persist/haptics + chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal + chmod 440 /mnt/vendor/persist/haptics/cs40l26_dual.cal + chown system system /mnt/vendor/persist/haptics + chown system system /mnt/vendor/persist/haptics/cs40l26.cal + chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal + + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us + + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/f0_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/q_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/redc_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/vibe_state + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/num_waves + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_offset + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/owt_free_space + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/delay_before_stop_playback_us + + enable vendor.vibrator.cs40l26 + enable vendor.vibrator.cs40l26-dual diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 3f99a48..0ea91ba 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -93,3 +93,24 @@ on property:sys.boot_completed=1 on override-sf-uclamp write /proc/vendor_sched/rt_uclamp_min 0 write /proc/vendor_sched/sf_uclamp_min 0 + +# Haptics +on property:vendor.all.modules.ready=1 + mkdir /mnt/vendor/persist/haptics 0770 system system + chmod 770 /mnt/vendor/persist/haptics + chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal + chown system system /mnt/vendor/persist/haptics + chown system system /mnt/vendor/persist/haptics/cs40l26.cal + + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us + + enable vendor.vibrator.cs40l26 From 44d4e48ecc980294c2f4cbc4adcc39eb9c5b52a5 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 18 Jan 2023 03:38:02 +0000 Subject: [PATCH 057/148] thermal: more aggressive CPU throttling policy Bug: 264725759 Test: Test Burn8, MH_OFF, MH_ON, Genshin Impact Change-Id: I2209159cc156b3b04301eda5560010c88c4982e4 --- thermal_info_config_cheetah.json | 73 +++++++++++++++++++++----------- thermal_info_config_panther.json | 69 ++++++++++++++++++++---------- 2 files changed, 96 insertions(+), 46 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 7a2dd16..b7ba66c 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -161,22 +161,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], "Coefficient":[1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 0, 300, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 1200, 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 1200, 200, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2400, 1600, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"], - "TranCycle": 5 + "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ { @@ -209,7 +208,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-GPU", + "Name":"VIRTUAL-SKIN-CPU-GPU", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -223,18 +222,44 @@ "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 0, 500, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 1500, 200, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2100, 1700, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"], - "TranCycle": 5 + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "CdevCeiling": [0, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "CdevCeiling": [0, 12, 12, 12, 12, 14, 14], + "LimitInfo": [0, 0, 0, 0, 12, 14, 14] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "CdevCeiling": [0, 15, 15, 15, 15, 17, 17], + "LimitInfo": [0, 0, 0, 0, 15, 17, 17] + }, { "CdevRequest": "thermal-gpufreq-0", "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], @@ -294,8 +319,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index b9bf892..f6caf0e 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -161,22 +161,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], "Coefficient":[1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 200, 200, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 0, 300, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 1200, 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 1200, 200, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2400, 1600, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"], - "TranCycle": 5 + "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ { @@ -209,7 +208,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-GPU", + "Name":"VIRTUAL-SKIN-CPU-GPU", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -223,18 +222,44 @@ "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 100, 350, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 0, 5, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 0, 500, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 1500, 800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 1500, 200, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2100, 1700, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 0, 2, "NAN", "NAN", "NAN"], - "TranCycle": 5 + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "CdevCeiling": [0, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "CdevCeiling": [0, 12, 12, 12, 12, 14, 14], + "LimitInfo": [0, 0, 0, 0, 12, 14, 14] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "CdevCeiling": [0, 15, 15, 15, 15, 17, 17], + "LimitInfo": [0, 0, 0, 0, 15, 17, 17] + }, { "CdevRequest": "thermal-gpufreq-0", "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], From df07d17914b44e9107ef7f1f1fb19dd7adcf97e6 Mon Sep 17 00:00:00 2001 From: Kris Chen Date: Tue, 21 Feb 2023 15:40:10 +0800 Subject: [PATCH 058/148] Remove the redundant g7 ta loading in init.xxx.rc Bug: 264646112 Test: fingerprint works fine after device reboot Change-Id: I7c8f5dba3ff74e83bae5f5f323bfe183c30289d1 --- conf/init.pantah.rc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 0ea91ba..443bb83 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -24,10 +24,6 @@ on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd -# Fingerprint -on post-fs-data - exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app - # Overrides fingerprint antispoof if following persist sysprops are set on boot && property:ro.build.type=userdebug && \ property:persist.vendor.fingerprint.disable.fake.override=0 From a28956c5cd32e935f7e5c3e9a3df1d6e39a0dca2 Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Thu, 23 Feb 2023 11:14:16 -0800 Subject: [PATCH 059/148] Enable country code update during setup wizard Bug: 267944733 Test: manual with various network Change-Id: I18e3868598b3a2336b8767c15caf20a835ad22a8 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 5 +++++ panther/rro_overlays/WifiOverlay/res/values/config.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index 70bdfb9..dbeec61 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -154,4 +154,9 @@ true + + + true diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 71a135e..4d230ee 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -154,4 +154,9 @@ true + + + true From 8b8cf4cab44f2d6e8d3781b0c52e72677c0427b4 Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Wed, 22 Feb 2023 21:51:06 +0800 Subject: [PATCH 060/148] haptics: update hapitcs sink and slot setting Bug: 270023634 Test: trigger audio coupled haptics via sound picker app Change-Id: Ie55c7d980a56c9c00230f434820750633f62d25e --- audio/cheetah/config/mixer_paths.xml | 2 +- audio/cloudripper/config/mixer_paths.xml | 4 ++-- audio/panther/config/mixer_paths.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml index 153f117..ef62bb6 100644 --- a/audio/cheetah/config/mixer_paths.xml +++ b/audio/cheetah/config/mixer_paths.xml @@ -42,7 +42,7 @@ - + diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml index c39cbfa..1798e49 100644 --- a/audio/cloudripper/config/mixer_paths.xml +++ b/audio/cloudripper/config/mixer_paths.xml @@ -37,8 +37,8 @@ - - + + diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml index 153f117..ef62bb6 100644 --- a/audio/panther/config/mixer_paths.xml +++ b/audio/panther/config/mixer_paths.xml @@ -42,7 +42,7 @@ - + From b4db474061c93a7a4dbe5ab03585346de62e5ca9 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Mon, 27 Feb 2023 17:04:03 -0800 Subject: [PATCH 061/148] thermal: lower tj control temp during battery save Use LOW_POWER power hint to detect and lower the control temp for junction control loops Bug: 266011718 Test: Build and boot on device. Check thermal control temperatures during battery save Change-Id: I8883255bdc9bf4c12231ba47a3a70966cfa927cc Signed-off-by: Sayanna Chandula --- powerhint-cheetah.json | 72 ++++++++++++++++++++++++++++++++++++++++++ powerhint-panther.json | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 09b898b..c023372 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -1726,6 +1726,78 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "LOW_POWER", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "TpuControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "AurControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "TpuSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "AurSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, { "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", diff --git a/powerhint-panther.json b/powerhint-panther.json index d1389e7..bc73538 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1593,6 +1593,78 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "LOW_POWER", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "TpuControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "AurControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "TpuSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "LOW_POWER", + "Node": "AurSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", From 390f5dd1ef8ee31fab0508b570ec555ca731d75c Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Thu, 9 Feb 2023 10:49:40 +0800 Subject: [PATCH 062/148] audio: create aidl test config Bug: 206738075 Test: build pass Change-Id: I8438c0779f54c8333eaca03745180c6922380b8f Signed-off-by: Jasmine Cha --- audio/cheetah/aidl_config/audio_effects.xml | 68 ++ .../audio_platform_configuration.xml | 319 ++++++ .../audio_platform_configuration_aidl.xml | 189 ++++ .../audio_policy_configuration.xml | 168 +++ ...cy_configuration_a2dp_offload_disabled.xml | 239 +++++ ...icy_configuration_bluetooth_legacy_hal.xml | 235 +++++ ...licy_configuration_le_offload_disabled.xml | 260 +++++ .../aidl_config/audio_policy_volumes.xml | 227 ++++ ...with_le_audio_policy_configuration_7_0.xml | 71 ++ audio/cheetah/aidl_config/mixer_paths.xml | 889 ++++++++++++++++ .../cheetah/aidl_config/mixer_paths_aidl.xml | 978 ++++++++++++++++++ .../aidl_config/mixer_paths_factory.xml | 388 +++++++ .../sound_trigger_configuration.xml | 33 + audio/cheetah/audio-tables.mk | 32 +- audio/panther/aidl_config/audio_effects.xml | 68 ++ .../audio_platform_configuration.xml | 319 ++++++ .../audio_platform_configuration_aidl.xml | 189 ++++ .../audio_policy_configuration.xml | 168 +++ ...cy_configuration_a2dp_offload_disabled.xml | 239 +++++ ...icy_configuration_bluetooth_legacy_hal.xml | 235 +++++ ...licy_configuration_le_offload_disabled.xml | 260 +++++ .../aidl_config/audio_policy_volumes.xml | 227 ++++ ...with_le_audio_policy_configuration_7_0.xml | 71 ++ audio/panther/aidl_config/mixer_paths.xml | 889 ++++++++++++++++ .../panther/aidl_config/mixer_paths_aidl.xml | 978 ++++++++++++++++++ .../aidl_config/mixer_paths_factory.xml | 388 +++++++ .../sound_trigger_configuration.xml | 33 + audio/panther/audio-tables.mk | 32 +- 28 files changed, 8172 insertions(+), 20 deletions(-) create mode 100644 audio/cheetah/aidl_config/audio_effects.xml create mode 100644 audio/cheetah/aidl_config/audio_platform_configuration.xml create mode 100644 audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_configuration.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml create mode 100644 audio/cheetah/aidl_config/audio_policy_volumes.xml create mode 100644 audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml create mode 100644 audio/cheetah/aidl_config/mixer_paths.xml create mode 100644 audio/cheetah/aidl_config/mixer_paths_aidl.xml create mode 100644 audio/cheetah/aidl_config/mixer_paths_factory.xml create mode 100644 audio/cheetah/aidl_config/sound_trigger_configuration.xml create mode 100644 audio/panther/aidl_config/audio_effects.xml create mode 100644 audio/panther/aidl_config/audio_platform_configuration.xml create mode 100644 audio/panther/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/panther/aidl_config/audio_policy_configuration.xml create mode 100644 audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml create mode 100644 audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml create mode 100644 audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml create mode 100644 audio/panther/aidl_config/audio_policy_volumes.xml create mode 100644 audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml create mode 100644 audio/panther/aidl_config/mixer_paths.xml create mode 100644 audio/panther/aidl_config/mixer_paths_aidl.xml create mode 100644 audio/panther/aidl_config/mixer_paths_factory.xml create mode 100644 audio/panther/aidl_config/sound_trigger_configuration.xml diff --git a/audio/cheetah/aidl_config/audio_effects.xml b/audio/cheetah/aidl_config/audio_effects.xml new file mode 100644 index 0000000..11e66e5 --- /dev/null +++ b/audio/cheetah/aidl_config/audio_effects.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_platform_configuration.xml b/audio/cheetah/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..84ee3a5 --- /dev/null +++ b/audio/cheetah/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..eef3e87 --- /dev/null +++ b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml new file mode 100644 index 0000000..121c3fe --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_configuration.xml @@ -0,0 +1,168 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml new file mode 100644 index 0000000..f5c129f --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -0,0 +1,239 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml new file mode 100644 index 0000000..92d97af --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -0,0 +1,235 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml new file mode 100644 index 0000000..7cf76e6 --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml @@ -0,0 +1,260 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_policy_volumes.xml b/audio/cheetah/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..04e731d --- /dev/null +++ b/audio/cheetah/aidl_config/audio_policy_volumes.xml @@ -0,0 +1,227 @@ + + + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-4700 + 33,-3500 + 66,-2350 + 100,-1250 + + + + + + + 1,-3350 + 33,-2100 + 66,-1000 + 100,0 + + + + + + + + + + + + 0,-4800 + 33,-2050 + 66,-800 + 100,0 + + + + + + + 1,-3800 + 33,-2600 + 66,-1400 + 100,0 + + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-4700 + 33,-3500 + 66,-2350 + 100,-1250 + + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-5500 + 33,-3650 + 66,-2700 + 100,-1800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..8b2af59 --- /dev/null +++ b/audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/audio/cheetah/aidl_config/mixer_paths.xml b/audio/cheetah/aidl_config/mixer_paths.xml new file mode 100644 index 0000000..153f117 --- /dev/null +++ b/audio/cheetah/aidl_config/mixer_paths.xml @@ -0,0 +1,889 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..502ca17 --- /dev/null +++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,978 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/mixer_paths_factory.xml b/audio/cheetah/aidl_config/mixer_paths_factory.xml new file mode 100644 index 0000000..4dfc826 --- /dev/null +++ b/audio/cheetah/aidl_config/mixer_paths_factory.xml @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/sound_trigger_configuration.xml b/audio/cheetah/aidl_config/sound_trigger_configuration.xml new file mode 100644 index 0000000..dbee090 --- /dev/null +++ b/audio/cheetah/aidl_config/sound_trigger_configuration.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/audio-tables.mk b/audio/cheetah/audio-tables.mk index 3acd5ac..d3499bf 100644 --- a/audio/cheetah/audio-tables.mk +++ b/audio/cheetah/audio-tables.mk @@ -16,24 +16,36 @@ AUDIO_TABLE_FOLDER := cheetah +# Enable this to build AIDL +# BUILD_AUDIO_AIDL_VERSION := true + +ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) +CONFIG_FOLDER := aidl_config +PRODUCT_COPY_FILES += \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml +else +CONFIG_FOLDER := config +endif + # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw diff --git a/audio/panther/aidl_config/audio_effects.xml b/audio/panther/aidl_config/audio_effects.xml new file mode 100644 index 0000000..11e66e5 --- /dev/null +++ b/audio/panther/aidl_config/audio_effects.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_platform_configuration.xml b/audio/panther/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..84ee3a5 --- /dev/null +++ b/audio/panther/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml new file mode 100644 index 0000000..eef3e87 --- /dev/null +++ b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml new file mode 100644 index 0000000..121c3fe --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_configuration.xml @@ -0,0 +1,168 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml new file mode 100644 index 0000000..f5c129f --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -0,0 +1,239 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml new file mode 100644 index 0000000..92d97af --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -0,0 +1,235 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml new file mode 100644 index 0000000..7cf76e6 --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml @@ -0,0 +1,260 @@ + + + + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_policy_volumes.xml b/audio/panther/aidl_config/audio_policy_volumes.xml new file mode 100644 index 0000000..04e731d --- /dev/null +++ b/audio/panther/aidl_config/audio_policy_volumes.xml @@ -0,0 +1,227 @@ + + + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-4700 + 33,-3500 + 66,-2350 + 100,-1250 + + + + + + + 1,-3350 + 33,-2100 + 66,-1000 + 100,0 + + + + + + + + + + + + 0,-4800 + 33,-2050 + 66,-800 + 100,0 + + + + + + + 1,-3800 + 33,-2600 + 66,-1400 + 100,0 + + + + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + 0,-2400 + 33,-1600 + 66,-800 + 100,0 + + + 0,-4200 + 33,-2800 + 66,-1400 + 100,0 + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-4700 + 33,-3500 + 66,-2350 + 100,-1250 + + + + + + 1,-3000 + 33,-2600 + 66,-2200 + 100,-1800 + + + 1,-5500 + 33,-3650 + 66,-2700 + 100,-1800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml new file mode 100644 index 0000000..8b2af59 --- /dev/null +++ b/audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/audio/panther/aidl_config/mixer_paths.xml b/audio/panther/aidl_config/mixer_paths.xml new file mode 100644 index 0000000..153f117 --- /dev/null +++ b/audio/panther/aidl_config/mixer_paths.xml @@ -0,0 +1,889 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml new file mode 100644 index 0000000..502ca17 --- /dev/null +++ b/audio/panther/aidl_config/mixer_paths_aidl.xml @@ -0,0 +1,978 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/mixer_paths_factory.xml b/audio/panther/aidl_config/mixer_paths_factory.xml new file mode 100644 index 0000000..4dfc826 --- /dev/null +++ b/audio/panther/aidl_config/mixer_paths_factory.xml @@ -0,0 +1,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/sound_trigger_configuration.xml b/audio/panther/aidl_config/sound_trigger_configuration.xml new file mode 100644 index 0000000..dbee090 --- /dev/null +++ b/audio/panther/aidl_config/sound_trigger_configuration.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/audio-tables.mk b/audio/panther/audio-tables.mk index e5e26fe..deee1cb 100644 --- a/audio/panther/audio-tables.mk +++ b/audio/panther/audio-tables.mk @@ -16,24 +16,36 @@ AUDIO_TABLE_FOLDER := panther +# Enable this to build AIDL +# BUILD_AUDIO_AIDL_VERSION := true + +ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) +CONFIG_FOLDER := aidl_config +PRODUCT_COPY_FILES += \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml +else +CONFIG_FOLDER := config +endif + # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw From 2cac090b40dfff81e861aae88d1e3effede65024 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Wed, 1 Mar 2023 06:41:52 +0000 Subject: [PATCH 063/148] soundtrigger: aidl table for P22 Test: verify with test build. Bug: 206738138 Change-Id: Ie3624b037b07b3384b97ca89eed3c018f752b6de --- audio/cheetah/aidl_config/audio_policy_configuration.xml | 6 ++++++ audio/cheetah/aidl_config/mixer_paths_aidl.xml | 3 +++ audio/panther/aidl_config/audio_policy_configuration.xml | 6 ++++++ audio/panther/aidl_config/mixer_paths_aidl.xml | 3 +++ 4 files changed, 18 insertions(+) diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml index 121c3fe..941c9f0 100644 --- a/audio/cheetah/aidl_config/audio_policy_configuration.xml +++ b/audio/cheetah/aidl_config/audio_policy_configuration.xml @@ -71,6 +71,11 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> + + + @@ -157,6 +162,7 @@ + diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml index 502ca17..aab517f 100644 --- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml +++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml @@ -587,6 +587,9 @@ + + + diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml index 121c3fe..941c9f0 100644 --- a/audio/panther/aidl_config/audio_policy_configuration.xml +++ b/audio/panther/aidl_config/audio_policy_configuration.xml @@ -71,6 +71,11 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> + + + @@ -157,6 +162,7 @@ + diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml index 502ca17..aab517f 100644 --- a/audio/panther/aidl_config/mixer_paths_aidl.xml +++ b/audio/panther/aidl_config/mixer_paths_aidl.xml @@ -587,6 +587,9 @@ + + + From 0db706b0f98fd72ed2f0324a0265dead95102a16 Mon Sep 17 00:00:00 2001 From: Patty Huang Date: Wed, 1 Mar 2023 11:42:32 +0800 Subject: [PATCH 064/148] Enable LE Audio unicast by default on android U Bug: 265225257 Test: LE Audio unicast related services are all enabled by default Change-Id: I9f62654e5a35d2b71cc9084ff09f8236934acdf1 --- device-cheetah.mk | 8 +++++++- device-panther.mk | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4307d39..b11304c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -193,7 +193,13 @@ endif PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=false \ - ro.bluetooth.leaudio_switcher.supported=true + ro.bluetooth.leaudio_switcher.supported=true \ + bluetooth.profile.bap.unicast.client.enabled=true \ + bluetooth.profile.csip.set_coordinator.enabled=true \ + bluetooth.profile.hap.client.enabled=true \ + bluetooth.profile.mcp.server.enabled=true \ + bluetooth.profile.ccp.server.enabled=true \ + bluetooth.profile.vcp.controller.enabled=true \ # Bluetooth LE Audio CIS handover to SCO # Set the property only if the controller doesn't support CIS and SCO diff --git a/device-panther.mk b/device-panther.mk index 5f745e3..5f48c41 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -165,7 +165,13 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=false \ - ro.bluetooth.leaudio_switcher.supported=true + ro.bluetooth.leaudio_switcher.supported=true \ + bluetooth.profile.bap.unicast.client.enabled=true \ + bluetooth.profile.csip.set_coordinator.enabled=true \ + bluetooth.profile.hap.client.enabled=true \ + bluetooth.profile.mcp.server.enabled=true \ + bluetooth.profile.ccp.server.enabled=true \ + bluetooth.profile.vcp.controller.enabled=true \ # Bluetooth LE Audio CIS handover to SCO # Set the property only if the controller doesn't support CIS and SCO From f158d00086321773b38eedd8eb3ab072e467e873 Mon Sep 17 00:00:00 2001 From: Oscar Shu Date: Thu, 23 Feb 2023 22:45:04 +0000 Subject: [PATCH 065/148] Update overlay to support MAC randomization on open SSIDs Bug: 270441948 Test: compile Change-Id: I146c2c5f1ee7057ba5a68d92822b689d689d0de1 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 1 + panther/rro_overlays/WifiOverlay/res/values/config.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index dbeec61..971e879 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -56,6 +56,7 @@ true + true true diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 4d230ee..6b716bd 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -59,6 +59,7 @@ true + true true From 81501e3260e8c38c36215d7504a17c4534ffb54f Mon Sep 17 00:00:00 2001 From: Jeff Pu Date: Thu, 2 Mar 2023 21:36:06 +0000 Subject: [PATCH 066/148] Remove fingerprint virtual hal from individual pixel device mk files since it is included in common one Bug: 270940857 Test: manual build Change-Id: I4e0ce8870869b92eba866092bddaf01a513e5342 --- device-cheetah.mk | 3 --- device-panther.mk | 3 --- 2 files changed, 6 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index b11304c..40da61d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -374,9 +374,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Virtual fingerprint HAL -PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example - # Setup Wizard device-specific settings PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ diff --git a/device-panther.mk b/device-panther.mk index 5f48c41..95a55bf 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -357,9 +357,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Virtual fingerprint HAL -PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example - # Setup Wizard device-specific settings PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ From 8fd0c77a16e3ab07525c73727c223e1e9380ac7b Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Tue, 29 Nov 2022 18:36:17 +0800 Subject: [PATCH 067/148] powerhint: Boost GPU(302000) by 1st frame Take ADPF_FIRST_FRAME hint to boost the GPU freq to 302000 Bug: 243025173 Test: Manual Change-Id: I52ab59a98ff5e14fe03e82ed73f18a3d9c961721 --- powerhint-cheetah.json | 6 ++++++ powerhint-panther.json | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index c023372..2e8ddce 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -1863,6 +1863,12 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "ADPF_FIRST_FRAME", + "Node": "GPUMinFreq", + "Duration": 50, + "Value": "302000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-panther.json b/powerhint-panther.json index bc73538..6e9f2a0 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1730,6 +1730,12 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "ADPF_FIRST_FRAME", + "Node": "GPUMinFreq", + "Duration": 50, + "Value": "302000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", From a0cd8baadee05afe2de33bc20f0b6871ea21b5b6 Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 1 Mar 2023 21:50:12 +0800 Subject: [PATCH 068/148] audio: add compressed offload to the AIDL audio_policy_configuration.xml Bug: 270552159 Test: n/a Change-Id: I950774fb0d5ab6571e34e83ebdab53d0dab4dec7 --- .../audio_policy_configuration.xml | 19 +++++++++++++++++-- .../cheetah/aidl_config/mixer_paths_aidl.xml | 2 +- .../audio_policy_configuration.xml | 19 +++++++++++++++++-- .../panther/aidl_config/mixer_paths_aidl.xml | 2 +- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml index 941c9f0..af824c3 100644 --- a/audio/cheetah/aidl_config/audio_policy_configuration.xml +++ b/audio/cheetah/aidl_config/audio_policy_configuration.xml @@ -36,6 +36,21 @@ + + + + + + + sources="primary output,deep buffer,haptic,voip_rx,compressed offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed offload"/> - + diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml index 941c9f0..af824c3 100644 --- a/audio/panther/aidl_config/audio_policy_configuration.xml +++ b/audio/panther/aidl_config/audio_policy_configuration.xml @@ -36,6 +36,21 @@ + + + + + + + sources="primary output,deep buffer,haptic,voip_rx,compressed offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed offload"/> - + From 96d8f09cf7fa51db051edadb97d183cc07450c69 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Mon, 6 Mar 2023 16:46:19 -0800 Subject: [PATCH 069/148] Add device irq map for Pixel 7 devices This xml maps the devices that can wake the main CPU up to subsystems that use them. Test: Builds, boots. Manualy verify the loaded map in the output of `dumpsys batterystats --wakeups` Bug: 271922941 Change-Id: Idd14c6a71c697fb649b42fe4886454fa3345aeba --- .../base/core/res/res/xml/irq_device_map.xml | 27 +++++++++++++++++++ .../base/core/res/res/xml/irq_device_map.xml | 27 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml create mode 100644 panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml new file mode 100644 index 0000000..beb5166 --- /dev/null +++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -0,0 +1,27 @@ + + + + + Alarm + + + Wifi + + + diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml new file mode 100644 index 0000000..beb5166 --- /dev/null +++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -0,0 +1,27 @@ + + + + + Alarm + + + Wifi + + + From 64b64c19804e4d7235a3b1636eddf4fb9aabe317 Mon Sep 17 00:00:00 2001 From: George Chang Date: Thu, 9 Mar 2023 08:04:59 +0000 Subject: [PATCH 070/148] [NFC] Add antenna position coordinates Bug: 272406680 Test: manual Change-Id: Ide00cc7d3e220c50c75e855d70305e7779e37e88 --- .../overlay/packages/apps/Nfc/res/values/config.xml | 10 ++++++++++ .../overlay/packages/apps/Nfc/res/values/config.xml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/cheetah/overlay/packages/apps/Nfc/res/values/config.xml b/cheetah/overlay/packages/apps/Nfc/res/values/config.xml index 659fb5a..0055264 100644 --- a/cheetah/overlay/packages/apps/Nfc/res/values/config.xml +++ b/cheetah/overlay/packages/apps/Nfc/res/values/config.xml @@ -22,4 +22,14 @@ GFE4J true + + 75 + 160 + false + + 38 + + + 100 + diff --git a/panther/overlay/packages/apps/Nfc/res/values/config.xml b/panther/overlay/packages/apps/Nfc/res/values/config.xml index ec07493..d5bfd3d 100644 --- a/panther/overlay/packages/apps/Nfc/res/values/config.xml +++ b/panther/overlay/packages/apps/Nfc/res/values/config.xml @@ -22,4 +22,14 @@ G03Z5 true + + 70 + 150 + false + + 38 + + + 97 + From 49c576ae22e7870f52fcba1e2502bba0334a28c6 Mon Sep 17 00:00:00 2001 From: Sal Savage Date: Fri, 17 Mar 2023 12:33:08 -0700 Subject: [PATCH 071/148] Use default assignment operator for LE Audio profile properties Since there's no other assignment currently (default value with no assignment is false) and other targets built on top of phones want to override these profile settings, we'll change the assignment operator used for the properties to "?=". This way, others can use "=" to override. Tag: #stability Bug: 274015277 Test: build and flash, observe no more build errors Merged-In: I1c1b656bd17b4da574e41a404289b974030fd2f5 Change-Id: I1c1b656bd17b4da574e41a404289b974030fd2f5 (cherry picked from commit c975e5e7752aeba7e168611207bacc721b6118dd) --- device-cheetah.mk | 12 ++++++------ device-panther.mk | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index da938bd..7088b86 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -194,12 +194,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true \ - bluetooth.profile.bap.unicast.client.enabled=true \ - bluetooth.profile.csip.set_coordinator.enabled=true \ - bluetooth.profile.hap.client.enabled=true \ - bluetooth.profile.mcp.server.enabled=true \ - bluetooth.profile.ccp.server.enabled=true \ - bluetooth.profile.vcp.controller.enabled=true \ + bluetooth.profile.bap.unicast.client.enabled?=true \ + bluetooth.profile.csip.set_coordinator.enabled?=true \ + bluetooth.profile.hap.client.enabled?=true \ + bluetooth.profile.mcp.server.enabled?=true \ + bluetooth.profile.ccp.server.enabled?=true \ + bluetooth.profile.vcp.controller.enabled?=true \ # Bluetooth LE Audio CIS handover to SCO # Set the property only if the controller doesn't support CIS and SCO diff --git a/device-panther.mk b/device-panther.mk index 5b82952..f3ef1a6 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -166,12 +166,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true \ - bluetooth.profile.bap.unicast.client.enabled=true \ - bluetooth.profile.csip.set_coordinator.enabled=true \ - bluetooth.profile.hap.client.enabled=true \ - bluetooth.profile.mcp.server.enabled=true \ - bluetooth.profile.ccp.server.enabled=true \ - bluetooth.profile.vcp.controller.enabled=true \ + bluetooth.profile.bap.unicast.client.enabled?=true \ + bluetooth.profile.csip.set_coordinator.enabled?=true \ + bluetooth.profile.hap.client.enabled?=true \ + bluetooth.profile.mcp.server.enabled?=true \ + bluetooth.profile.ccp.server.enabled?=true \ + bluetooth.profile.vcp.controller.enabled?=true \ # Bluetooth LE Audio CIS handover to SCO # Set the property only if the controller doesn't support CIS and SCO From 22b6dc88e34616ce635f02ae777352af955d7157 Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 22 Mar 2023 18:15:32 +0000 Subject: [PATCH 072/148] Remove unused dimen auth_ripple_alpha_in_duration Bug: 274785453 Test: device builds Change-Id: I16995427297c5d11ee5448fb8be53682ab36e5d7 --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 4 ---- 2 files changed, 7 deletions(-) diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 4ce1f63..735cd9c 100644 --- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -44,8 +44,5 @@ 60px - - - 0 diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index ff76828..bbb6ac3 100644 --- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -49,10 +49,6 @@ 48px - - 0 - 16px From e4cd4bf4ae34a8b36f32f3b183d3e373094ace30 Mon Sep 17 00:00:00 2001 From: chenkris Date: Thu, 23 Mar 2023 07:46:10 +0000 Subject: [PATCH 073/148] Move udfps antispoof property to common g7 folder Bug: 270657514 Test: authenticate fake finger Change-Id: I6bcfa7bd948cab8037bda68f1722e0cc60ad0c4c --- conf/init.pantah.rc | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 443bb83..1cfed0d 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -24,19 +24,6 @@ on property:vendor.mfgapi.touchpanel.permission=1 chmod 0600 /sys/devices/virtual/sec/tsp/cmd chown system system /sys/devices/virtual/sec/tsp/cmd -# Overrides fingerprint antispoof if following persist sysprops are set -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=0 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=1 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=100 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - # WiFi on post-fs-data setprop wifi.direct.interface p2p-dev-wlan0 From 14235c553e0485ddf926a85149d9dcb69e39d132 Mon Sep 17 00:00:00 2001 From: David Li Date: Fri, 24 Mar 2023 10:42:21 +0800 Subject: [PATCH 074/148] audio: reorg aidl_config and add voice call paths Bug: 206737711 Test: mm Change-Id: I465b1beb2156f63823f944350e62138cfdced3cf --- audio/cheetah/aidl_config/audio_effects.xml | 68 -- .../audio_platform_configuration.xml | 319 ------- .../audio_platform_configuration_aidl.xml | 196 +--- .../audio_policy_configuration.xml | 362 +++---- ...cy_configuration_a2dp_offload_disabled.xml | 239 ----- ...icy_configuration_bluetooth_legacy_hal.xml | 235 ----- ...licy_configuration_le_offload_disabled.xml | 260 ----- ...with_le_audio_policy_configuration_7_0.xml | 71 -- audio/cheetah/aidl_config/mixer_paths.xml | 889 ------------------ .../cheetah/aidl_config/mixer_paths_aidl.xml | 285 ++---- .../aidl_config/mixer_paths_factory.xml | 388 -------- .../sound_trigger_configuration.xml | 33 - audio/cheetah/audio-tables.mk | 33 +- audio/panther/aidl_config/audio_effects.xml | 68 -- .../audio_platform_configuration.xml | 319 ------- .../audio_platform_configuration_aidl.xml | 198 +--- .../audio_policy_configuration.xml | 364 +++---- ...cy_configuration_a2dp_offload_disabled.xml | 239 ----- ...icy_configuration_bluetooth_legacy_hal.xml | 235 ----- ...licy_configuration_le_offload_disabled.xml | 260 ----- ...with_le_audio_policy_configuration_7_0.xml | 71 -- audio/panther/aidl_config/mixer_paths.xml | 889 ------------------ .../panther/aidl_config/mixer_paths_aidl.xml | 285 ++---- .../aidl_config/mixer_paths_factory.xml | 388 -------- .../sound_trigger_configuration.xml | 33 - audio/panther/audio-tables.mk | 33 +- 26 files changed, 646 insertions(+), 6114 deletions(-) delete mode 100644 audio/cheetah/aidl_config/audio_effects.xml delete mode 100644 audio/cheetah/aidl_config/audio_platform_configuration.xml delete mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml delete mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml delete mode 100644 audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml delete mode 100644 audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml delete mode 100644 audio/cheetah/aidl_config/mixer_paths.xml delete mode 100644 audio/cheetah/aidl_config/mixer_paths_factory.xml delete mode 100644 audio/cheetah/aidl_config/sound_trigger_configuration.xml delete mode 100644 audio/panther/aidl_config/audio_effects.xml delete mode 100644 audio/panther/aidl_config/audio_platform_configuration.xml delete mode 100644 audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml delete mode 100644 audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml delete mode 100644 audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml delete mode 100644 audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml delete mode 100644 audio/panther/aidl_config/mixer_paths.xml delete mode 100644 audio/panther/aidl_config/mixer_paths_factory.xml delete mode 100644 audio/panther/aidl_config/sound_trigger_configuration.xml diff --git a/audio/cheetah/aidl_config/audio_effects.xml b/audio/cheetah/aidl_config/audio_effects.xml deleted file mode 100644 index 11e66e5..0000000 --- a/audio/cheetah/aidl_config/audio_effects.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/cheetah/aidl_config/audio_platform_configuration.xml b/audio/cheetah/aidl_config/audio_platform_configuration.xml deleted file mode 100644 index 84ee3a5..0000000 --- a/audio/cheetah/aidl_config/audio_platform_configuration.xml +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml index eef3e87..c1739fd 100644 --- a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml +++ b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml @@ -25,165 +25,47 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml index af824c3..28c8663 100644 --- a/audio/cheetah/aidl_config/audio_policy_configuration.xml +++ b/audio/cheetah/aidl_config/audio_policy_configuration.xml @@ -11,179 +11,191 @@ limitations under the License. --> - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index f5c129f..0000000 --- a/audio/cheetah/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml deleted file mode 100644 index 92d97af..0000000 --- a/audio/cheetah/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml deleted file mode 100644 index 7cf76e6..0000000 --- a/audio/cheetah/aidl_config/audio_policy_configuration_le_offload_disabled.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index 8b2af59..0000000 --- a/audio/cheetah/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/audio/cheetah/aidl_config/mixer_paths.xml b/audio/cheetah/aidl_config/mixer_paths.xml deleted file mode 100644 index 153f117..0000000 --- a/audio/cheetah/aidl_config/mixer_paths.xml +++ /dev/null @@ -1,889 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml index 260cda6..17c4660 100644 --- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml +++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml @@ -378,7 +378,7 @@ - + @@ -425,15 +425,13 @@ - - - + @@ -457,7 +455,7 @@ - + @@ -480,15 +478,12 @@ - - - - + - + @@ -512,7 +507,7 @@ - + @@ -536,8 +531,8 @@ - - + + @@ -553,13 +548,13 @@ - - + + - - + + @@ -571,6 +566,10 @@ + + + + @@ -579,6 +578,14 @@ + + + + + + + + @@ -587,25 +594,17 @@ + + + + + + + + - - - - - - - - - - - - - - - - @@ -615,53 +614,35 @@ - - - - - - - - - - - - - - - + - + - + - - - - - + - + + + + + - + - - - - - + @@ -669,55 +650,19 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -736,12 +681,6 @@ - - - - - - @@ -758,12 +697,10 @@ - + - - - @@ -772,76 +709,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -851,16 +727,35 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -869,9 +764,6 @@ - - - @@ -881,9 +773,6 @@ - - - @@ -895,9 +784,6 @@ - - - @@ -907,9 +793,6 @@ - - - @@ -919,9 +802,6 @@ - - - @@ -931,9 +811,6 @@ - - - @@ -944,9 +821,6 @@ - - - @@ -957,9 +831,6 @@ - - - diff --git a/audio/cheetah/aidl_config/mixer_paths_factory.xml b/audio/cheetah/aidl_config/mixer_paths_factory.xml deleted file mode 100644 index 4dfc826..0000000 --- a/audio/cheetah/aidl_config/mixer_paths_factory.xml +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/cheetah/aidl_config/sound_trigger_configuration.xml b/audio/cheetah/aidl_config/sound_trigger_configuration.xml deleted file mode 100644 index dbee090..0000000 --- a/audio/cheetah/aidl_config/sound_trigger_configuration.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/cheetah/audio-tables.mk b/audio/cheetah/audio-tables.mk index d3499bf..cb48b46 100644 --- a/audio/cheetah/audio-tables.mk +++ b/audio/cheetah/audio-tables.mk @@ -20,32 +20,33 @@ AUDIO_TABLE_FOLDER := cheetah # BUILD_AUDIO_AIDL_VERSION := true ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) -CONFIG_FOLDER := aidl_config +# AIDL HAL configs are in the *config_aidl* folder PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else -CONFIG_FOLDER := config -endif - +# HIDL HAL configs are in the *config* folder # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml +endif # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw diff --git a/audio/panther/aidl_config/audio_effects.xml b/audio/panther/aidl_config/audio_effects.xml deleted file mode 100644 index 11e66e5..0000000 --- a/audio/panther/aidl_config/audio_effects.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/panther/aidl_config/audio_platform_configuration.xml b/audio/panther/aidl_config/audio_platform_configuration.xml deleted file mode 100644 index 84ee3a5..0000000 --- a/audio/panther/aidl_config/audio_platform_configuration.xml +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml index eef3e87..f518bb3 100644 --- a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml +++ b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml @@ -25,165 +25,49 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml index af824c3..dfc8577 100644 --- a/audio/panther/aidl_config/audio_policy_configuration.xml +++ b/audio/panther/aidl_config/audio_policy_configuration.xml @@ -11,179 +11,193 @@ limitations under the License. --> - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Speaker + Speaker Safe + Earpiece + Built-In Mic + Built-In Back Mic + Telephony Tx + Voice Call And Telephony Rx + Echo Ref In + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index f5c129f..0000000 --- a/audio/panther/aidl_config/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml deleted file mode 100644 index 92d97af..0000000 --- a/audio/panther/aidl_config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml deleted file mode 100644 index 7cf76e6..0000000 --- a/audio/panther/aidl_config/audio_policy_configuration_le_offload_disabled.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - Speaker - Speaker Safe - Earpiece - Built-In Mic - Built-In Back Mic - Telephony Tx - Voice Call And Telephony Rx - Echo Ref In - - Speaker - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml deleted file mode 100644 index 8b2af59..0000000 --- a/audio/panther/aidl_config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/audio/panther/aidl_config/mixer_paths.xml b/audio/panther/aidl_config/mixer_paths.xml deleted file mode 100644 index 153f117..0000000 --- a/audio/panther/aidl_config/mixer_paths.xml +++ /dev/null @@ -1,889 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml index 260cda6..17c4660 100644 --- a/audio/panther/aidl_config/mixer_paths_aidl.xml +++ b/audio/panther/aidl_config/mixer_paths_aidl.xml @@ -378,7 +378,7 @@ - + @@ -425,15 +425,13 @@ - - - + @@ -457,7 +455,7 @@ - + @@ -480,15 +478,12 @@ - - - - + - + @@ -512,7 +507,7 @@ - + @@ -536,8 +531,8 @@ - - + + @@ -553,13 +548,13 @@ - - + + - - + + @@ -571,6 +566,10 @@ + + + + @@ -579,6 +578,14 @@ + + + + + + + + @@ -587,25 +594,17 @@ + + + + + + + + - - - - - - - - - - - - - - - - @@ -615,53 +614,35 @@ - - - - - - - - - - - - - - - + - + - + - - - - - + - + + + + + - + - - - - - + @@ -669,55 +650,19 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -736,12 +681,6 @@ - - - - - - @@ -758,12 +697,10 @@ - + - - - @@ -772,76 +709,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -851,16 +727,35 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -869,9 +764,6 @@ - - - @@ -881,9 +773,6 @@ - - - @@ -895,9 +784,6 @@ - - - @@ -907,9 +793,6 @@ - - - @@ -919,9 +802,6 @@ - - - @@ -931,9 +811,6 @@ - - - @@ -944,9 +821,6 @@ - - - @@ -957,9 +831,6 @@ - - - diff --git a/audio/panther/aidl_config/mixer_paths_factory.xml b/audio/panther/aidl_config/mixer_paths_factory.xml deleted file mode 100644 index 4dfc826..0000000 --- a/audio/panther/aidl_config/mixer_paths_factory.xml +++ /dev/null @@ -1,388 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/panther/aidl_config/sound_trigger_configuration.xml b/audio/panther/aidl_config/sound_trigger_configuration.xml deleted file mode 100644 index dbee090..0000000 --- a/audio/panther/aidl_config/sound_trigger_configuration.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/panther/audio-tables.mk b/audio/panther/audio-tables.mk index deee1cb..0fee32c 100644 --- a/audio/panther/audio-tables.mk +++ b/audio/panther/audio-tables.mk @@ -20,32 +20,33 @@ AUDIO_TABLE_FOLDER := panther # BUILD_AUDIO_AIDL_VERSION := true ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) -CONFIG_FOLDER := aidl_config +# AIDL HAL configs are in the *aidl_config* folder PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else -CONFIG_FOLDER := config -endif - +# HIDL HAL configs are in the *config* folder # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml # Mixer Path Configuration for AudioHAL PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/$(CONFIG_FOLDER)/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml +endif # Speaker firmware files SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw From 63421394863636e89898c0df65682306fc2749e3 Mon Sep 17 00:00:00 2001 From: Liang Li Date: Mon, 13 Mar 2023 21:23:49 -0700 Subject: [PATCH 075/148] Enable adjusting link layer stats polling interval Enable the feature of adjusting link layer stats polling interval in Pixels. Bug: 237530606 Test: manual Change-Id: I7298acef18ca1bbcfce89cbd642846bc501f7475 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 4 ++++ panther/rro_overlays/WifiOverlay/res/values/config.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index 971e879..0e5e364 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -160,4 +160,8 @@ no telephony country code and driver country code is 00. This is applied only during the setup wizard --> true + + + true diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 6b716bd..c905558 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -160,4 +160,8 @@ no telephony country code and driver country code is 00. This is applied only during the setup wizard --> true + + + true From 79a3eae957d9e2bafaf98b67aa72bcea9264db4e Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Thu, 13 Apr 2023 10:00:29 +0000 Subject: [PATCH 076/148] [Quickstart] Turn off QS on legacy Pixels Bug: 277898824 Change-Id: I7773d5bf9345288428947cbb146fc90b873fbac2 Test: manually test --- device-cheetah.mk | 4 ---- device-panther.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 2efea11..93952fc 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -374,9 +374,5 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-panther.mk b/device-panther.mk index b11e89c..0c25c51 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -357,9 +357,5 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From 277a8670595133b5100290bfd7ade1ca6fd00047 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Fri, 14 Apr 2023 01:13:36 +0000 Subject: [PATCH 077/148] Revert "[Quickstart] Turn off QS on legacy Pixels" Revert submission 22606975-turn off qs Reason for revert: confirm with team that this CL submit too early and need to rollback then submit again at 4/19. Reverted changes: /q/submissionid:22606975-turn+off+qs Change-Id: I7334caba23540ec68224971ca8b42f4aebd05227 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 93952fc..2efea11 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -374,5 +374,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ + # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-panther.mk b/device-panther.mk index 0c25c51..b11e89c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -357,5 +357,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ + # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From 66e20271874f7bee0f0bdec203b9d4f848f0aa2c Mon Sep 17 00:00:00 2001 From: Shuibing Dai Date: Thu, 13 Apr 2023 17:28:02 -0700 Subject: [PATCH 078/148] Enable updating country code from scan results for generic case Bug: 271928725 Bug: 267944733 Test: manually test Change-Id: Ic58802de7829ff0c82d088a34a5c7d019ec7e003 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ panther/rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index 0e5e364..fa61183 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -164,4 +164,10 @@ true + + + true diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index c905558..29a474f 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -164,4 +164,10 @@ true + + + true From 22da5b272a125155f2b33f991b44af9620c205ad Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 12 Apr 2023 14:42:45 +0800 Subject: [PATCH 079/148] audio: update table - move control Mic Spatial Module Enable to code. - add camcorder mic setting. - move definition of Waves instance id number to code. Bug: 206738075 Test: manual test/ host test vendor.google.whitechapel.audio.hal.audio.tuner_tests Change-Id: I8ba5dee5a6f5a25f1b208a8cd305a0f9141b5e8a Signed-off-by: Jasmine Cha --- .../audio_platform_configuration_aidl.xml | 5 ++--- audio/cheetah/aidl_config/mixer_paths_aidl.xml | 16 +++++++++++++--- .../audio_platform_configuration_aidl.xml | 11 ++++------- audio/panther/aidl_config/mixer_paths_aidl.xml | 16 +++++++++++++--- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml index c1739fd..bc050e3 100644 --- a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml +++ b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml @@ -63,9 +63,8 @@ - - + + diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml index 17c4660..894ef4e 100644 --- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml +++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml @@ -254,7 +254,6 @@ - @@ -738,7 +737,6 @@ - @@ -757,8 +755,20 @@ + + + + + + + + + + + + + - diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml index f518bb3..bc050e3 100644 --- a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml +++ b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml @@ -54,20 +54,17 @@ - + - + - - + + diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml index 17c4660..894ef4e 100644 --- a/audio/panther/aidl_config/mixer_paths_aidl.xml +++ b/audio/panther/aidl_config/mixer_paths_aidl.xml @@ -254,7 +254,6 @@ - @@ -738,7 +737,6 @@ - @@ -757,8 +755,20 @@ + + + + + + + + + + + + + - From b2bfcf6b59898d0bda8bba2e78274ff768597241 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 18 Apr 2023 13:05:02 +0000 Subject: [PATCH 080/148] [USB Audio] Enable 192k support sample rate to hifi usb related cl: ag/22549253 Test: Local Test. Bug: 198122814 Change-Id: I518671e5196c65a1a764aeae73d0a2ae01e14645 --- audio/cheetah/config/audio_platform_configuration.xml | 2 +- audio/cloudripper/config/audio_platform_configuration.xml | 2 +- audio/panther/config/audio_platform_configuration.xml | 2 +- audio/ravenclaw/config/audio_platform_configuration.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml index 84ee3a5..5522ce1 100644 --- a/audio/cheetah/config/audio_platform_configuration.xml +++ b/audio/cheetah/config/audio_platform_configuration.xml @@ -304,7 +304,7 @@ - + diff --git a/audio/cloudripper/config/audio_platform_configuration.xml b/audio/cloudripper/config/audio_platform_configuration.xml index d1428d5..8f74505 100644 --- a/audio/cloudripper/config/audio_platform_configuration.xml +++ b/audio/cloudripper/config/audio_platform_configuration.xml @@ -295,7 +295,7 @@ - + diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml index 84ee3a5..5522ce1 100644 --- a/audio/panther/config/audio_platform_configuration.xml +++ b/audio/panther/config/audio_platform_configuration.xml @@ -304,7 +304,7 @@ - + diff --git a/audio/ravenclaw/config/audio_platform_configuration.xml b/audio/ravenclaw/config/audio_platform_configuration.xml index 2da5912..f91af55 100644 --- a/audio/ravenclaw/config/audio_platform_configuration.xml +++ b/audio/ravenclaw/config/audio_platform_configuration.xml @@ -295,7 +295,7 @@ - + From a904c56d0cd63cf43140d4f77685292e3431a25c Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Tue, 18 Apr 2023 09:30:46 +0000 Subject: [PATCH 081/148] Revert^2 "[Quickstart] Turn off QS on legacy Pixels" 277a8670595133b5100290bfd7ade1ca6fd00047 Change-Id: Icdaae0874a5fc9b6ad0212b4cc883e81c594cebc --- device-cheetah.mk | 4 ---- device-panther.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 2efea11..93952fc 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -374,9 +374,5 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-panther.mk b/device-panther.mk index b11e89c..0c25c51 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -357,9 +357,5 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From 8e5eab0390c095c59a60e714665b1b9b309dec20 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 12 Apr 2023 20:14:56 +0800 Subject: [PATCH 082/148] powerhint: Boost GPU(302000) by 1st frame Use CPU_LOAD_RESET hint to boost the GPU freq to 302000 Bug: 243025173 Test: Manual Change-Id: I519297e55aa8efd84d408a81d6cd1d2bea76df3c --- powerhint-cheetah.json | 38 +++++++++++++++++++------------------- powerhint-panther.json | 38 +++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 2e8ddce..00602a2 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -1,5 +1,18 @@ { "Nodes": [ + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", + "Values": [ + "848000", + "762000", + "572000", + "471000", + "302000", + "202000" + ], + "ResetOnInit": true + }, { "Name": "MemFreq", "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", @@ -114,19 +127,6 @@ ], "ResetOnInit": true }, - { - "Name": "GPUMinFreq", - "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", - "Values": [ - "848000", - "762000", - "572000", - "471000", - "302000", - "202000" - ], - "ResetOnInit": true - }, { "Name": "GPUDvfsPeriod", "Path": "/sys/devices/platform/28000000.mali/dvfs_period", @@ -776,6 +776,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "GPUMinFreq", + "Duration": 50, + "Value": "302000" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "MemFreq", @@ -1863,12 +1869,6 @@ "Duration": 0, "Value": "572000" }, - { - "PowerHint": "ADPF_FIRST_FRAME", - "Node": "GPUMinFreq", - "Duration": 50, - "Value": "302000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-panther.json b/powerhint-panther.json index 6e9f2a0..9af32bd 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1,5 +1,18 @@ { "Nodes": [ + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", + "Values": [ + "848000", + "762000", + "572000", + "471000", + "302000", + "202000" + ], + "ResetOnInit": true + }, { "Name": "MemFreq", "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", @@ -103,19 +116,6 @@ ], "ResetOnInit": true }, - { - "Name": "GPUMinFreq", - "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", - "Values": [ - "848000", - "762000", - "572000", - "471000", - "302000", - "202000" - ], - "ResetOnInit": true - }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -745,6 +745,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "GPUMinFreq", + "Duration": 50, + "Value": "302000" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "MemFreq", @@ -1730,12 +1736,6 @@ "Duration": 0, "Value": "572000" }, - { - "PowerHint": "ADPF_FIRST_FRAME", - "Node": "GPUMinFreq", - "Duration": 50, - "Value": "302000" - }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", From 52bc1939d265fd3904970394ecc52e739141f32f Mon Sep 17 00:00:00 2001 From: Patty Huang Date: Fri, 7 Apr 2023 15:50:39 +0800 Subject: [PATCH 083/148] Enable 32k for some audio configurations with offload path Bug: 272597112 Test: check the offload supported config Change-Id: I644c3429c1ebad892a77ccfcbf45deb2d8278cf2 --- bluetooth/le_audio_codec_capabilities.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index a836273..89d0de6 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -44,6 +44,8 @@ + + @@ -56,6 +58,8 @@ + + @@ -63,6 +67,7 @@ + From 955862ddf2210288cb547ed12199e0a0566734d5 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Fri, 21 Apr 2023 10:14:00 +0800 Subject: [PATCH 084/148] audio: update aidl platform config - Add spatial_capture_conditions since this conditions will be different by each project. Bug: 267548143 Test: manual test Change-Id: I05e6124dad0afed267ec1caa2f469312589a7d73 Signed-off-by: Jasmine Cha --- .../aidl_config/audio_platform_configuration_aidl.xml | 6 ++++++ .../aidl_config/audio_platform_configuration_aidl.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml index bc050e3..912b4aa 100644 --- a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml +++ b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml @@ -61,6 +61,12 @@ + + + + + + diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml index bc050e3..912b4aa 100644 --- a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml +++ b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml @@ -61,6 +61,12 @@ + + + + + + From 98c7f943083f7b4ebbe67904d9bb73d1513c9840 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Wed, 12 Apr 2023 05:09:28 +0000 Subject: [PATCH 085/148] Disable Settings large-screen optimization Disable the optimization that is automatically enabled when including Window Extensions through Activity Embedding. The optimization causes to launch an additional trampoline activity for deep links, even when the screen size is smaller than required by Activity Embedding rules. Bug: 267725145 Test: Build, perf metrics Change-Id: I3310b63f655c3b859ab294b9174eb1be12cb6392 --- device-cheetah.mk | 3 +++ device-panther.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 93952fc..2f99f02 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -376,3 +376,6 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.sys.fflag.override.settings_support_large_screen=false diff --git a/device-panther.mk b/device-panther.mk index 0c25c51..a210489 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -359,3 +359,6 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.sys.fflag.override.settings_support_large_screen=false From 5ba908f5a4b7ae95e57e9f34cab412435e991256 Mon Sep 17 00:00:00 2001 From: Qing Wang Date: Mon, 24 Apr 2023 23:13:35 +0000 Subject: [PATCH 086/148] Revert "Disable Settings large-screen optimization" This reverts commit 98c7f943083f7b4ebbe67904d9bb73d1513c9840. Reason for revert: b/279461170 Change-Id: Ic9a73c7cdee01926d08ac109e4f298ee178f9a66 --- device-cheetah.mk | 3 --- device-panther.mk | 3 --- 2 files changed, 6 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 2f99f02..93952fc 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -376,6 +376,3 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.sys.fflag.override.settings_support_large_screen=false diff --git a/device-panther.mk b/device-panther.mk index a210489..0c25c51 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -359,6 +359,3 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.sys.fflag.override.settings_support_large_screen=false From 78cbe9bdabd921dc3d8989c1db6ede15bea42e50 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 20 Apr 2023 18:43:34 +0800 Subject: [PATCH 087/148] Add device mk OWNERS Bug: 278167548 Change-Id: Ic69edf70df5940e06769a643a0be73dca71384dc --- OWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OWNERS b/OWNERS index 5aee848..61b3e45 100644 --- a/OWNERS +++ b/OWNERS @@ -1 +1,4 @@ per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com + +# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS From 3cdcdda06921299bacd8421c75c9f7854d6047b9 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Thu, 6 Apr 2023 17:04:16 +0000 Subject: [PATCH 088/148] powerhint.json: Update uclamp_min hint to account for margin Upstream has fixed relationship between uclamp_min and margin which means uclamp_min value between 80-100% of capacity of the CPU is a valid value and will not cause upmigration. To keep the current hints in powerhint.json the same, we must update uclamp_min to be capacity_orig_of(medium_cpu) + 1. This change is dependent on uclamp vs fits margin in GKI, vendor modules. And an improvement in sched_pixel to ignore the 25% boost if the only reason to request the frequency is uclamp_min. To cater for the later - we multiply each uclamp_min value with 1.25 - except ones that look intentionally set around capacity boundaries. Bug: 261695590 Test: UiBench Signed-off-by: Qais Yousef Change-Id: I1736489c63591feb62b04468c6a8b1208ee1bfff --- powerhint-cheetah-a0.json | 44 ++++++++++++++++----------------- powerhint-cheetah.json | 40 +++++++++++++++--------------- powerhint-cloudripper.json | 50 +++++++++++++++++++------------------- powerhint-panther-a0.json | 44 ++++++++++++++++----------------- powerhint-panther.json | 40 +++++++++++++++--------------- powerhint-ravenclaw.json | 50 +++++++++++++++++++------------------- 6 files changed, 134 insertions(+), 134 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index c92e892..0362d66 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -151,7 +151,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", "Values": [ - "612", + "765", "0" ], "ResetOnInit": true @@ -160,7 +160,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "612", + "765", "1", "63" ], @@ -179,8 +179,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "650" + "225", + "813" ], "DefaultIndex": 0, "ResetOnInit": true @@ -662,7 +662,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "612" + "Value": "765" }, { "PowerHint": "LAUNCH", @@ -769,7 +769,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "612" + "Value": "765" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1671,13 +1671,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "63" + "Value": "79" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "63" + "Value": "79" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", @@ -1964,7 +1964,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "650" + "Value": "813" }, { "PowerHint": "ML_ACC", @@ -1986,8 +1986,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2010,8 +2010,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2034,8 +2034,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2061,9 +2061,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2085,9 +2085,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2109,7 +2109,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 00602a2..08c7e43 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -169,7 +169,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", "Values": [ - "612", + "765", "0" ], "ResetOnInit": true @@ -178,7 +178,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "612", + "765", "1" ], "ResetOnInit": true @@ -196,8 +196,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "650" + "225", + "813" ], "DefaultIndex": 0, "ResetOnInit": true @@ -698,7 +698,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "612" + "Value": "765" }, { "PowerHint": "LAUNCH", @@ -834,7 +834,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "612" + "Value": "765" }, { "PowerHint": "CAMERA_LAUNCH", @@ -2407,7 +2407,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "650" + "Value": "813" }, { "PowerHint": "ML_ACC", @@ -2429,8 +2429,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2453,8 +2453,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2477,8 +2477,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2504,9 +2504,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2528,9 +2528,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2552,7 +2552,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 8991299..c8bda7b 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -123,11 +123,11 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "0", - "553", - "246", - "185", - "123", - "62" + "692", + "308", + "232", + "154", + "78" ], "DefaultIndex": 0, "ResetOnInit": true @@ -320,19 +320,19 @@ "PowerHint": "INTERACTION_120", "Node": "TAUClampBoost", "Duration": 6000, - "Value": "246" + "Value": "308" }, { "PowerHint": "INTERACTION_90", "Node": "TAUClampBoost", "Duration": 6000, - "Value": "185" + "Value": "232" }, { "PowerHint": "INTERACTION_60", "Node": "TAUClampBoost", "Duration": 6000, - "Value": "123" + "Value": "154" }, { "PowerHint": "REFRESH_120FPS", @@ -406,7 +406,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", @@ -1006,19 +1006,19 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "185" + "Value": "232" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "123" + "Value": "154" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "62" + "Value": "78" }, { "PowerHint": "DISABLE_TA_BOOST", @@ -1102,8 +1102,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1126,8 +1126,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1150,8 +1150,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1177,9 +1177,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1201,9 +1201,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1225,7 +1225,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 6744496..4effc18 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -140,7 +140,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", "Values": [ - "612", + "765", "0" ], "ResetOnInit": true @@ -149,7 +149,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "612", + "765", "1", "63" ], @@ -168,8 +168,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "650" + "225", + "813" ], "DefaultIndex": 0, "ResetOnInit": true @@ -651,7 +651,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "612" + "Value": "765" }, { "PowerHint": "LAUNCH", @@ -758,7 +758,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "612" + "Value": "765" }, { "PowerHint": "CAMERA_LAUNCH", @@ -1558,13 +1558,13 @@ "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "63" + "Value": "79" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "63" + "Value": "79" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", @@ -1851,7 +1851,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "650" + "Value": "813" }, { "PowerHint": "ML_ACC", @@ -1873,8 +1873,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1897,8 +1897,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1921,8 +1921,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1948,9 +1948,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1972,9 +1972,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1996,7 +1996,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-panther.json b/powerhint-panther.json index 9af32bd..e8a3fb0 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -149,7 +149,7 @@ "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", "Values": [ - "612", + "765", "0" ], "ResetOnInit": true @@ -158,7 +158,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "612", + "765", "1" ], "ResetOnInit": true @@ -176,8 +176,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "650" + "225", + "813" ], "DefaultIndex": 0, "ResetOnInit": true @@ -667,7 +667,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "612" + "Value": "765" }, { "PowerHint": "LAUNCH", @@ -803,7 +803,7 @@ "PowerHint": "CAMERA_LAUNCH", "Node": "CAMUClampBoost", "Duration": 1000, - "Value": "612" + "Value": "765" }, { "PowerHint": "CAMERA_LAUNCH", @@ -2274,7 +2274,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "650" + "Value": "813" }, { "PowerHint": "ML_ACC", @@ -2296,8 +2296,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2320,8 +2320,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2344,8 +2344,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -2371,9 +2371,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2395,9 +2395,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2419,7 +2419,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 0b3c4c5..2a0f41a 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -123,11 +123,11 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "0", - "553", - "246", - "185", - "123", - "62" + "692", + "308", + "232", + "154", + "78" ], "DefaultIndex": 0, "ResetOnInit": true @@ -320,19 +320,19 @@ "PowerHint": "INTERACTION_120", "Node": "TAUClampBoost", "Duration": 6000, - "Value": "246" + "Value": "308" }, { "PowerHint": "INTERACTION_90", "Node": "TAUClampBoost", "Duration": 6000, - "Value": "185" + "Value": "232" }, { "PowerHint": "INTERACTION_60", "Node": "TAUClampBoost", "Duration": 6000, - "Value": "123" + "Value": "154" }, { "PowerHint": "REFRESH_120FPS", @@ -406,7 +406,7 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", @@ -1006,19 +1006,19 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "185" + "Value": "232" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "123" + "Value": "154" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "62" + "Value": "78" }, { "PowerHint": "DISABLE_TA_BOOST", @@ -1102,8 +1102,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1126,8 +1126,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1150,8 +1150,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1177,9 +1177,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1201,9 +1201,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1225,7 +1225,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, From 5ec2a126feb1047f0993b82303b14b2bfbfd2cdf Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 26 Apr 2023 10:35:43 +0000 Subject: [PATCH 089/148] Fix wrong uclamp setting Bug: 279708843 Signed-off-by: Qais Yousef Change-Id: I017e5e3a8b7d50541791876f9b29f8bd33434e10 --- powerhint-cheetah-a0.json | 2 +- powerhint-panther-a0.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 0362d66..a771e86 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -162,7 +162,7 @@ "Values": [ "765", "1", - "63" + "79" ], "ResetOnInit": true }, diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 4effc18..144d0ba 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -151,7 +151,7 @@ "Values": [ "765", "1", - "63" + "79" ], "ResetOnInit": true }, From 83e0fd5167c79588b806030c635962414f5ffa1d Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 26 Apr 2023 10:35:43 +0000 Subject: [PATCH 090/148] Fix wrong uclamp setting Bug: 279708843 Signed-off-by: Qais Yousef (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ec2a126feb1047f0993b82303b14b2bfbfd2cdf) Merged-In: I017e5e3a8b7d50541791876f9b29f8bd33434e10 Change-Id: I017e5e3a8b7d50541791876f9b29f8bd33434e10 --- powerhint-cheetah-a0.json | 2 +- powerhint-panther-a0.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 0362d66..a771e86 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -162,7 +162,7 @@ "Values": [ "765", "1", - "63" + "79" ], "ResetOnInit": true }, diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 4effc18..144d0ba 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -151,7 +151,7 @@ "Values": [ "765", "1", - "63" + "79" ], "ResetOnInit": true }, From f556de9f1f9c14dab8d88ca1c595bb02bc9091f7 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Mon, 24 Apr 2023 06:42:09 +0000 Subject: [PATCH 091/148] audio: add smartfeature table for chre tuning note: add smartfeature.gstf that only used for Hotword pipeline in AoC which is sharing to chre usage too. On WHI_PRO CHRE PDM Gain(gain=158) CHRE AEC Gain(gain=-42) CHRE SRC AEC Timeout(timeout=0) This table also contains hotword gain control as Non Eraser gain (gain=220) Eraser Post Gain (gain=220) Test: end-to-end verify by CHRE using aoc_audio_cfg to query gain as below adb shell aoc_audio_cfg hotword_get_non_eraser_gain adb shell aoc_audio_cfg hotword_get_eraser_post_gain Bug: 271078701 Change-Id: I14ee4856887d6a6587b34733288a76c305c271dc --- audio/cheetah/audio-tables.mk | 1 + audio/cheetah/tuning/bluenote/smartfeature.gstf | Bin 0 -> 236 bytes audio/panther/audio-tables.mk | 1 + audio/panther/tuning/bluenote/smartfeature.gstf | Bin 0 -> 236 bytes 4 files changed, 2 insertions(+) create mode 100644 audio/cheetah/tuning/bluenote/smartfeature.gstf create mode 100644 audio/panther/tuning/bluenote/smartfeature.gstf diff --git a/audio/cheetah/audio-tables.mk b/audio/cheetah/audio-tables.mk index cb48b46..d4ce667 100644 --- a/audio/cheetah/audio-tables.mk +++ b/audio/cheetah/audio-tables.mk @@ -57,6 +57,7 @@ PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*) # Audio tuning PRODUCT_COPY_FILES += \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/smartfeature.gstf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/smartfeature.gstf \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \ diff --git a/audio/cheetah/tuning/bluenote/smartfeature.gstf b/audio/cheetah/tuning/bluenote/smartfeature.gstf new file mode 100644 index 0000000000000000000000000000000000000000..d174ae3054805add8e670b0f638dc4e901b7713f GIT binary patch literal 236 zcmXRZ%}aj5z`#(JT9n5Eq#1#@q%<%60+3EENlaG&((SR^J9oCe@aA1?Vg2&C+@4jJ zHiT}T|Ki%B&+C|*qxHJ8Q!9%(fa;*YAtkXSaRQL@f|-G#11!kQAfV2`0OT^L0I@L8 z5|CXWAPQyQ0kXxB*n&XyAh+-Uu{M%=A)q)&uK^HiB8f*Lv7?~uc|bMMQ1-R||NjF3 D7(6K? literal 0 HcmV?d00001 diff --git a/audio/panther/audio-tables.mk b/audio/panther/audio-tables.mk index 0fee32c..6a7619f 100644 --- a/audio/panther/audio-tables.mk +++ b/audio/panther/audio-tables.mk @@ -57,6 +57,7 @@ PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*) # Audio tuning PRODUCT_COPY_FILES += \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/smartfeature.gstf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/smartfeature.gstf \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \ diff --git a/audio/panther/tuning/bluenote/smartfeature.gstf b/audio/panther/tuning/bluenote/smartfeature.gstf new file mode 100644 index 0000000000000000000000000000000000000000..d174ae3054805add8e670b0f638dc4e901b7713f GIT binary patch literal 236 zcmXRZ%}aj5z`#(JT9n5Eq#1#@q%<%60+3EENlaG&((SR^J9oCe@aA1?Vg2&C+@4jJ zHiT}T|Ki%B&+C|*qxHJ8Q!9%(fa;*YAtkXSaRQL@f|-G#11!kQAfV2`0OT^L0I@L8 z5|CXWAPQyQ0kXxB*n&XyAh+-Uu{M%=A)q)&uK^HiB8f*Lv7?~uc|bMMQ1-R||NjF3 D7(6K? literal 0 HcmV?d00001 From adf93a57815e897d64fb6d5286f8b8549d7a69fb Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Wed, 26 Apr 2023 16:03:54 +0800 Subject: [PATCH 092/148] Disable Settings large-screen optimization Disable the optimization that is automatically enabled when including Window Extensions through Activity Embedding. The optimization causes to launch an additional trampoline activity for deep links, even when the screen size is smaller than required by Activity Embedding rules. Bug: 267725145 Bug: 279461170 Test: Build, perf metrics Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests Change-Id: I0a032022b80d6171e77ce87c7b09d9aa7c9b3187 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 93952fc..dcf80b2 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -376,3 +376,7 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false diff --git a/device-panther.mk b/device-panther.mk index 0c25c51..ab95c0b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -359,3 +359,7 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false From 61e1cb8b173855b975f1e26897dce312cd3201a9 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Wed, 3 May 2023 16:05:25 +0000 Subject: [PATCH 093/148] Revert "Disable Settings large-screen optimization" Revert submission 22926596-disable_large_screen_opt Reason for revert: b/280606740 Reverted changes: /q/submissionid:22926596-disable_large_screen_opt Change-Id: Iceb14a1ae1006193f9522a7a88e494918c367bb3 --- device-cheetah.mk | 4 ---- device-panther.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index dcf80b2..93952fc 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -376,7 +376,3 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false diff --git a/device-panther.mk b/device-panther.mk index ab95c0b..0c25c51 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -359,7 +359,3 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false From d786ac91caa4f97dcb62462dcd1e44d064ead59b Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Tue, 2 May 2023 16:54:56 -0700 Subject: [PATCH 094/148] Add wakeup interrupt mapping Test: Manually inspect the output of: `dumpsys batterystats --wakeups` Bug: 271922941 Change-Id: I185b0be3b12a70bee7d40d4bfafc36b344989260 --- .../frameworks/base/core/res/res/xml/irq_device_map.xml | 6 ++++++ .../frameworks/base/core/res/res/xml/irq_device_map.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index beb5166..f36ea00 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -23,5 +23,11 @@ Wifi + + Cellular_data + + + Sensor + diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index beb5166..f36ea00 100644 --- a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -23,5 +23,11 @@ Wifi + + Cellular_data + + + Sensor + From 85d508c7b6629de00b17bd635333185b4fbe16e9 Mon Sep 17 00:00:00 2001 From: Shuibing Dai Date: Tue, 2 May 2023 13:49:05 -0700 Subject: [PATCH 095/148] Remove overlay item: country code update during setup wizard The country code updating from scan results generic case can cover setup wizard case. Bug: 279625751 Test: manually verified generic case Change-Id: I364b6f64c4d0bd5a575ca1d8e11872b22ea5ed5e --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 5 ----- panther/rro_overlays/WifiOverlay/res/values/config.xml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index fa61183..a0f0ac0 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -156,11 +156,6 @@ is when the system is in the suspended mode --> true - - true - true diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 29a474f..daa6e49 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -156,11 +156,6 @@ is when the system is in the suspended mode --> true - - true - true From 16c067a53e70b5b1e78f5ffeb1370d34569fa520 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Tue, 21 Feb 2023 09:42:12 +0800 Subject: [PATCH 096/148] thermal: Update config for stats Bug: 259903201 Test: local build and verify stats Change-Id: Ia1b0c4d31427f1100cec23548e7a8a390179e7b1 --- thermal_info_config_cheetah.json | 42 +++++++++++++++++++++++++++++++- thermal_info_config_panther.json | 42 +++++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index b7ba66c..6ef7ea7 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -833,5 +833,45 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-GNSS-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB2-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QUIET-USB2", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-NEUTRAL-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index f6caf0e..f0abf68 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -834,5 +834,45 @@ "PowerSampleDelay":7000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-QUIET-QI", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QUIET-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-NEUTRAL-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } From 0302209e61d8e4c43a26cb853c017f2a7e7343ca Mon Sep 17 00:00:00 2001 From: Nathan Kulczak Date: Thu, 27 Apr 2023 20:32:41 +0000 Subject: [PATCH 097/148] [DO NOT MERGE] vibrator: Disable PWLE capability for U Set chirp.enabled=0 so that CAP_FREQUENCY_CONTROL and CAP_COMPOSE_PWLE_EFFECTS will not be enabled. Bug: 275032416 Test: adb shell idlcli vibrator getCapabilities Change-Id: I7371f896126fdc876c43d60718baffba59aa32a1 Signed-off-by: Nathan Kulczak --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 93952fc..997f061 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -340,7 +340,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=1 \ + ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.214 \ ro.vendor.vibrator.hal.loc.coeff=2.7 diff --git a/device-panther.mk b/device-panther.mk index 0c25c51..20363ad 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -326,7 +326,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=1 \ + ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.195 \ ro.vendor.vibrator.hal.loc.coeff=2.65 # Keyboard bottom padding in dp for portrait mode and height ratio From 653f25765f6504046710426ec288fa63ad400732 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Thu, 4 May 2023 18:30:48 +0000 Subject: [PATCH 098/148] Revert^2 Disable Settings large-screen optimization Disable the optimization that is automatically enabled when including Window Extensions through Activity Embedding. The optimization causes to launch an additional trampoline activity for deep links, even when the screen size is smaller than required by Activity Embedding rules. Bug: 267725145 Bug: 279461170 fixes: 280606740 Test: Build, perf metrics Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests Test: atest SettingsMultiPaneDeepLinkTest.java Test: run v2/aep-ironwood/suite/test-mapping-ironwood-p0-cujs via ABTD on cheetah/oriole/panther/raven in udc-dev/master branch Change-Id: I532ebbcdc93f13c8d4cf956b53b498be907c4349 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 997f061..e1f5e13 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -376,3 +376,7 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false diff --git a/device-panther.mk b/device-panther.mk index 20363ad..21e2f75 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -359,3 +359,7 @@ PRODUCT_COPY_FILES += \ # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false From fb95508be53078c9c518db92f8436992c14a2b18 Mon Sep 17 00:00:00 2001 From: Jiaming Liu Date: Tue, 9 May 2023 04:58:38 +0000 Subject: [PATCH 099/148] Disable WM Extensions on Pixel 7 Bug: 266196089 Test: Build Change-Id: Iebd3b9ab6b1bb5acbfa680faf844d86c5d9c9f57 --- device-cheetah.mk | 7 ------- device-panther.mk | 7 ------- 2 files changed, 14 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index e1f5e13..f9b8f61 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -373,10 +373,3 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml - -# Window Extensions -$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false diff --git a/device-panther.mk b/device-panther.mk index 21e2f75..f289096 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -356,10 +356,3 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml - -# Window Extensions -$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false From 1fb658e2c067e0d8c04e8ab644e0e864ddd16418 Mon Sep 17 00:00:00 2001 From: Kenzi Mudge Date: Tue, 9 May 2023 09:58:04 -0400 Subject: [PATCH 100/148] Enable UWB filter engine Updated overlay file to configure and enable the UWB filter engine on Cheetah. Bug: b/237098661 Test: make, flash, manual test Change-Id: I793ee6df33fdf23254ccd806d00f6940e69996c7 --- cheetah/rro_overlays/UwbOverlay/res/values/config.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cheetah/rro_overlays/UwbOverlay/res/values/config.xml b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml index 7a77d32..0d69434 100644 --- a/cheetah/rro_overlays/UwbOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml @@ -17,4 +17,15 @@ */ --> + + true + + + false + + + true From 58e2461348d8be87d1a435921ef28b7237b8db83 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Tue, 11 Apr 2023 13:38:10 +0800 Subject: [PATCH 101/148] uwb: update uwb calibration for CCC antenna config Bug: 249170179 Test: build pass Change-Id: Ief9f932b71bba71555d601da92bb7e4d4dc69e1e Signed-off-by: Rex Lin --- uwb/UWB-calibration-ce.conf | 17 ++++++----------- uwb/UWB-calibration-default.conf | 17 ++++++----------- uwb/UWB-calibration-fcc.conf | 17 ++++++----------- uwb/UWB-calibration-jp.conf | 17 ++++++----------- uwb/UWB-calibration-restricted.conf | 17 ++++++----------- uwb/UWB-calibration-tw.conf | 17 ++++++----------- uwb/UWB-calibration.conf | 19 +++++++------------ 7 files changed, 43 insertions(+), 78 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index e123728..fae3dd9 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x53532B53 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 4affed8..99020e6 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 4affed8..99020e6 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 8798ccd..5e45dae 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x01 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x01 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 3732304..864381f 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0xFFFF +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index e7e7863..853f60a 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index a1e9de1..f676eea 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 @@ -150,4 +145,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 -alternate_pulse_shape=0x01 +alternate_pulse_shape=0x00 From 900d70ae6f5507daf332f5c45f771123cd25b2f6 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 10 May 2023 15:50:49 -0700 Subject: [PATCH 102/148] Adding interrupt mapping for sound_trigger wakeups Test: Manually inspect the output of `dumpsys batterystats --wakeups` Bug: 271922941 Change-Id: I0a79073ae875104495caf87b35ed8fc8bcc6c805 --- .../frameworks/base/core/res/res/xml/irq_device_map.xml | 3 +++ .../frameworks/base/core/res/res/xml/irq_device_map.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index f36ea00..2a53b55 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,6 +26,9 @@ Cellular_data + + Sound_trigger + Sensor diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index f36ea00..2a53b55 100644 --- a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,6 +26,9 @@ Cellular_data + + Sound_trigger + Sensor From a3a36e3b000e6cd1857678c6adb0b1fce137b380 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 10 May 2023 10:39:58 +0000 Subject: [PATCH 103/148] The dvfs headroom was split into its own knob. Update to use it. util_threshold only controls migration margin now. dvfs headroom has its own new knob. Bug: 261705301 Signed-off-by: Qais Yousef Change-Id: If5f24b6efd645c3aed602dfa219f91c8a49cfaf4 --- powerhint-cheetah-a0.json | 16 ++++++++++++++++ powerhint-cheetah.json | 16 ++++++++++++++++ powerhint-cloudripper.json | 16 ++++++++++++++++ powerhint-panther-a0.json | 16 ++++++++++++++++ powerhint-panther.json | 16 ++++++++++++++++ powerhint-ravenclaw.json | 16 ++++++++++++++++ 6 files changed, 96 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index a771e86..665c384 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -137,6 +137,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -1263,6 +1273,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 08c7e43..35cce08 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -155,6 +155,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -1328,6 +1338,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index c8bda7b..68d5c41 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -109,6 +109,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -744,6 +754,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 144d0ba..478619f 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -126,6 +126,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -1150,6 +1160,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", diff --git a/powerhint-panther.json b/powerhint-panther.json index e8a3fb0..83bf9c5 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -135,6 +135,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -1195,6 +1205,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 2a0f41a..d1148b1 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -109,6 +109,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -744,6 +754,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", From 8fbe052a265aff1fadf4827e5bbe1647af397f60 Mon Sep 17 00:00:00 2001 From: Shuibing Dai Date: Fri, 12 May 2023 16:54:52 -0700 Subject: [PATCH 104/148] Disable p2p 6ghz channels It has an effect on following case: If STA firstly connected with 6ghz channel AP and Application create p2p group without config, wpa_supplicant also tried to select STA-associated channel(in this case, i.e. 6ghz ch). Bug: 281733591 Test: atest android.net.wifi.cts.ConcurrencyTest#testPersistentGroupOperation Change-Id: Ie268443dbf1f3d0d6e3f355f97bc65c5c0f24a13 --- wifi/p2p_supplicant_overlay.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf index 4ec8453..74d24d8 100644 --- a/wifi/p2p_supplicant_overlay.conf +++ b/wifi/p2p_supplicant_overlay.conf @@ -8,3 +8,4 @@ p2p_add_cli_chan=1 disable_scan_offload=1 p2p_go_vht=1 p2p_pref_chan=124:149, 115:36 +p2p_6ghz_disable=1 From 0e6d072da788ebebceee2f0f50d66a355c56ba66 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 13 May 2023 22:40:37 +0000 Subject: [PATCH 105/148] Update pantah SVN to 22 Bug: 282371465 Change-Id: I39035ebc5a1ed4b381d83b49409f7de08dc7f533 --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 5950a9f..dc91433 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -272,7 +272,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=21 + ro.vendor.build.svn=22 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index c506fea..ffc5134 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -257,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=21 + ro.vendor.build.svn=22 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 89035cc0e172d2b88d2a9d5cbc6f5f2c99e0f51c Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Mon, 15 May 2023 02:24:48 +0000 Subject: [PATCH 106/148] pantah: remove customizedMaxCachedProcesses With project Snowbird in U, the MaxCachedProcesses is 1024 by default Bug: 278086134 Test: Build Change-Id: I42bafaf0512ba0bb50e9e4027b3ef4b0632e749e --- cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- panther/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index fea7a7e..98d5c30 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -183,9 +183,6 @@ 0.335 - - 64 - 2 3 diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index b9a028d..63165c5 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -205,9 +205,6 @@ 0.335 - - 64 - 2 3 From 1849f957c0e7a8d838943342805b30e4d2e70d47 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Wed, 17 May 2023 08:13:51 +0000 Subject: [PATCH 107/148] gps: include gps/brcm/cbd_gps.mk - include cbd_gps for cloudripper Bug: 282877296 Test: verify in-market device and dev board at b/282877296 Change-Id: I420de5f1ff420003821246a1bcc9ae2d52cfd823 --- device-cloudripper.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 447bf2a..0a4dfc1 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -26,6 +26,7 @@ include device/google/gs201/device-shipping-common.mk include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/syna/syna.mk # go/lyric-soong-variables From ceb3dadd5c4125639ea8b9f40a88da1e69191018 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 25 May 2023 18:18:40 +0000 Subject: [PATCH 108/148] Update pantah SVN to 23 Bug: 282371465 Change-Id: Ifbc093eaca81a4397474064313f9b45fd10f5d26 --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index dc91433..1c654a9 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -272,7 +272,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=22 + ro.vendor.build.svn=23 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index ffc5134..214b32d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -257,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=22 + ro.vendor.build.svn=23 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 65bdfe80d619bd6615ece890bf3fca907d9bca0a Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 26 May 2023 19:25:25 +0000 Subject: [PATCH 109/148] Update pantah SVN to 24 Bug: 282371465 Change-Id: Ia10396ad2685465f2f3c3af9be2e7bdb14422e5c --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 1c654a9..0ec6e47 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -272,7 +272,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=23 + ro.vendor.build.svn=24 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index 214b32d..1909173 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -257,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=23 + ro.vendor.build.svn=24 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From b8aebb4f058539a2ca113a5fead4034c592f66e2 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Fri, 26 May 2023 13:11:51 -0700 Subject: [PATCH 110/148] Update Sound_trigger interrupt mapping Test: Manually verify the output of `dumpsys batterystats --wakeups` Bug: 284405919 Change-Id: If9bdc26b78a45a4a88ce1b515d898232def6fd17 --- .../overlay/frameworks/base/core/res/res/xml/irq_device_map.xml | 2 +- .../overlay/frameworks/base/core/res/res/xml/irq_device_map.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index 2a53b55..9b3e461 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,7 +26,7 @@ Cellular_data - + Sound_trigger diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index 2a53b55..9b3e461 100644 --- a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,7 +26,7 @@ Cellular_data - + Sound_trigger From dd47a275be002e81cb26a5b1e11f89db22cff382 Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 16 May 2023 17:34:57 +0800 Subject: [PATCH 111/148] Update cs40l26 modprobe modules Bug: 278018625 Test: Driver probed and checked lsmod. Change-Id: Ia60b72f9a03853b0d67cd50b550bc831fa663c1a --- init.insmod.cheetah.cfg | 3 +-- init.insmod.cloudripper.cfg | 3 +-- init.insmod.panther.cfg | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/init.insmod.cheetah.cfg b/init.insmod.cheetah.cfg index 7487e1e..5a38650 100644 --- a/init.insmod.cheetah.cfg +++ b/init.insmod.cheetah.cfg @@ -9,8 +9,7 @@ modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-spi.ko modprobe|syna_touch.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko +modprobe|cs40l26-i2c.ko modprobe|snd-soc-cs40l26.ko # All device specific modules loaded diff --git a/init.insmod.cloudripper.cfg b/init.insmod.cloudripper.cfg index 4d6ab6f..aa7bab4 100644 --- a/init.insmod.cloudripper.cfg +++ b/init.insmod.cloudripper.cfg @@ -10,8 +10,7 @@ modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-i2c.ko modprobe|ftm5.ko modprobe|sec_touch.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko +modprobe|cs40l26-i2c.ko modprobe|snd-soc-cs40l26.ko # All device specific modules loaded diff --git a/init.insmod.panther.cfg b/init.insmod.panther.cfg index c82a69e..1a07eff 100644 --- a/init.insmod.panther.cfg +++ b/init.insmod.panther.cfg @@ -9,8 +9,7 @@ modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-spi.ko modprobe|focal_touch.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko +modprobe|cs40l26-i2c.ko modprobe|snd-soc-cs40l26.ko # All device specific modules loaded From 17eaf1af2a0c360e47d2b14a1ce1c6afaf4e7c9f Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 16 May 2023 16:14:46 +0800 Subject: [PATCH 112/148] Revert "haptics: update hapitcs sink and slot setting" This reverts commit 8b8cf4cab44f2d6e8d3781b0c52e72677c0427b4. Bug: 278018625 Test: Check audio coupled haptics at the sound preview app. Change-Id: Ifa4f55c0b2de85bee9cc4c3e1a642c54cf5ea44a --- audio/cheetah/config/mixer_paths.xml | 2 +- audio/cloudripper/config/mixer_paths.xml | 4 ++-- audio/panther/config/mixer_paths.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml index ef62bb6..153f117 100644 --- a/audio/cheetah/config/mixer_paths.xml +++ b/audio/cheetah/config/mixer_paths.xml @@ -42,7 +42,7 @@ - + diff --git a/audio/cloudripper/config/mixer_paths.xml b/audio/cloudripper/config/mixer_paths.xml index 1798e49..c39cbfa 100644 --- a/audio/cloudripper/config/mixer_paths.xml +++ b/audio/cloudripper/config/mixer_paths.xml @@ -37,8 +37,8 @@ - - + + diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml index ef62bb6..153f117 100644 --- a/audio/panther/config/mixer_paths.xml +++ b/audio/panther/config/mixer_paths.xml @@ -42,7 +42,7 @@ - + From 63e74e6ffdaeb9656591f1307b4056ae8079af33 Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 17 Feb 2023 14:47:49 -0800 Subject: [PATCH 113/148] dck: add SE capability property Bug: 285390995 Test: boot cheetah; check logs to see that SE property is used Signed-off-by: Jeffrey Carlyle Change-Id: I4b6a168dde62ec311ca1f392101335977ca70f32 --- device-cheetah.mk | 3 ++- device-panther.mk | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index bc3c72e..2b7378a 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -310,7 +310,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=3 + ro.gms.dck.eligible_wcc=3 \ + ro.gms.dck.se_capability=1 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-panther.mk b/device-panther.mk index 83a8a37..5a32028 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -295,7 +295,9 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=2 + ro.gms.dck.eligible_wcc=2 \ + ro.gms.dck.se_capability=1 + # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 6b27c8bffe380e718f11412e03eb84bd35b9a7e7 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Thu, 1 Jun 2023 20:51:24 +0000 Subject: [PATCH 114/148] Remove rt_uclamp_min and sf_uclamp_min rt_uclamp_min and sf_uclamp_min have been made redundant in Pixel by ADPF for sf, so we are just going to remove them outright rather than worrying about overriding them later Bug: 285248880 Test: manual Change-Id: I0da0693d2ee66cd63f622a8144f17b5692a2619d --- conf/init.pantah.rc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 1cfed0d..54dbb2e 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -69,14 +69,6 @@ on property:ro.boot.hardware.revision=PROTO1.0 on property:ro.boot.hardware.revision=PROTO1.1 setprop vendor.thermal.config "thermal_info_config_proto.json" -# 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 - # Haptics on property:vendor.all.modules.ready=1 mkdir /mnt/vendor/persist/haptics 0770 system system From fd62dd32043e8600dd52d2f8771dffbd6e254fe1 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 1 Jun 2023 16:12:35 -0700 Subject: [PATCH 115/148] Update vendor blobs for u BUG: 285414611 Change-Id: I6382152c787a1fa98015af24bf4fdf92bcc01878 --- self-extractors_cheetah/extract-lists.txt | 2 +- self-extractors_cheetah/google_devices/staging/Android.mk | 2 +- .../google_devices/staging/device-partial.mk | 2 +- self-extractors_panther/extract-lists.txt | 2 +- self-extractors_panther/google_devices/staging/Android.mk | 2 +- .../google_devices/staging/device-partial.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/self-extractors_cheetah/extract-lists.txt b/self-extractors_cheetah/extract-lists.txt index 255e82e..9fc0800 100644 --- a/self-extractors_cheetah/extract-lists.txt +++ b/self-extractors_cheetah/extract-lists.txt @@ -11,7 +11,7 @@ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/QualifiedNetworksService/QualifiedNetworksService.apk \ + system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ system_ext/priv-app/UwbVendorService/UwbVendorService.apk \ " ;; diff --git a/self-extractors_cheetah/google_devices/staging/Android.mk b/self-extractors_cheetah/google_devices/staging/Android.mk index 6e1e67e..8982deb 100644 --- a/self-extractors_cheetah/google_devices/staging/Android.mk +++ b/self-extractors_cheetah/google_devices/staging/Android.mk @@ -24,7 +24,7 @@ endif ifneq ($(filter cheetah,$(TARGET_DEVICE)),) include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := QualifiedNetworksService +LOCAL_MODULE := PixelQualifiedNetworksService LOCAL_MODULE_TAGS := optional LOCAL_BUILT_MODULE_STEM := package.apk LOCAL_SYSTEM_EXT_MODULE := true diff --git a/self-extractors_cheetah/google_devices/staging/device-partial.mk b/self-extractors_cheetah/google_devices/staging/device-partial.mk index c7a502d..45a4692 100644 --- a/self-extractors_cheetah/google_devices/staging/device-partial.mk +++ b/self-extractors_cheetah/google_devices/staging/device-partial.mk @@ -17,7 +17,7 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - QualifiedNetworksService \ + PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ UwbVendorService \ diff --git a/self-extractors_panther/extract-lists.txt b/self-extractors_panther/extract-lists.txt index e09731b..63655a4 100644 --- a/self-extractors_panther/extract-lists.txt +++ b/self-extractors_panther/extract-lists.txt @@ -10,7 +10,7 @@ system_ext/lib64/libmediaadaptor.so \ system_ext/priv-app/ShannonRcs/ShannonRcs.apk \ system_ext/priv-app/ShannonIms/ShannonIms.apk \ - system_ext/priv-app/QualifiedNetworksService/QualifiedNetworksService.apk \ + system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \ " ;; diff --git a/self-extractors_panther/google_devices/staging/Android.mk b/self-extractors_panther/google_devices/staging/Android.mk index 21f8297..763f1fb 100644 --- a/self-extractors_panther/google_devices/staging/Android.mk +++ b/self-extractors_panther/google_devices/staging/Android.mk @@ -24,7 +24,7 @@ endif ifneq ($(filter panther,$(TARGET_DEVICE)),) include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE := QualifiedNetworksService +LOCAL_MODULE := PixelQualifiedNetworksService LOCAL_MODULE_TAGS := optional LOCAL_BUILT_MODULE_STEM := package.apk LOCAL_SYSTEM_EXT_MODULE := true diff --git a/self-extractors_panther/google_devices/staging/device-partial.mk b/self-extractors_panther/google_devices/staging/device-partial.mk index 72b15e6..38d2027 100644 --- a/self-extractors_panther/google_devices/staging/device-partial.mk +++ b/self-extractors_panther/google_devices/staging/device-partial.mk @@ -17,7 +17,7 @@ PRODUCT_SOONG_NAMESPACES += \ # AOSP packages required by the blobs PRODUCT_PACKAGES := \ - QualifiedNetworksService \ + PixelQualifiedNetworksService \ ShannonIms \ ShannonRcs \ From a97f8338bcf0e7bad149c138450efbd39a750824 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sun, 4 Jun 2023 02:29:54 +0000 Subject: [PATCH 116/148] Update pantah SVN to 25 Bug: 285692955 Change-Id: Ic409552b9d9d4f8082f92982b1dcf16e3fe5c79a --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 0ec6e47..2de56b8 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -272,7 +272,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=24 + ro.vendor.build.svn=25 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index 1909173..d215770 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -257,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=24 + ro.vendor.build.svn=25 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 5e9dcac16ca8127beeade984c84ad5a0a1d74dfc Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sun, 4 Jun 2023 02:30:39 +0000 Subject: [PATCH 117/148] Update pantah SVN to 26 Bug: 285692955 Change-Id: Id82cde234a20bd6b62ee49f10df63a27d1d59cdf --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 2de56b8..eeb0561 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -272,7 +272,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=25 + ro.vendor.build.svn=26 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index d215770..d7a9caf 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -257,7 +257,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=25 + ro.vendor.build.svn=26 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 9476623265ec21103e3f9bdc11811054164ed29a Mon Sep 17 00:00:00 2001 From: paulsu Date: Mon, 5 Jun 2023 03:34:48 +0000 Subject: [PATCH 118/148] Create group throttle powerhint Test: Local test Bug: 280258727 Change-Id: Idfad9655cd0f12fd8a5c2ca43482a7665386e59d Signed-off-by: paulsu --- powerhint-cheetah.json | 50 ++++++++++++++++++++++++++++++++++++++++++ powerhint-panther.json | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 35cce08..7a798de 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -636,6 +636,26 @@ "0,1,2,3,4,5,6,7" ], "Type": "Property" + }, + { + "Name": "Dex2oatGroup", + "Path": "/proc/vendor_sched/dex2oat_ug", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "UgBgGroupThrottle", + "Path": "/proc/vendor_sched/ug_bg_group_throttle", + "Values": [ + "512", + "308" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -1975,6 +1995,12 @@ "Duration": 0, "Value": "0,1,2,3,4,5" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", @@ -2065,6 +2091,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", @@ -2155,6 +2187,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", @@ -2245,6 +2283,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", @@ -2353,6 +2397,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther.json b/powerhint-panther.json index 83bf9c5..ff2eb27 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -616,6 +616,26 @@ "0,1,2,3,4,5,6,7" ], "Type": "Property" + }, + { + "Name": "Dex2oatGroup", + "Path": "/proc/vendor_sched/dex2oat_ug", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "UgBgGroupThrottle", + "Path": "/proc/vendor_sched/ug_bg_group_throttle", + "Values": [ + "512", + "308" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -1842,6 +1862,12 @@ "Duration": 0, "Value": "0,1,2,3,4,5" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", @@ -1932,6 +1958,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", @@ -2022,6 +2054,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", @@ -2112,6 +2150,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", @@ -2220,6 +2264,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", From 4a23f98723969841e452583310b31f741b854c81 Mon Sep 17 00:00:00 2001 From: paulsu Date: Wed, 14 Jun 2023 05:23:07 +0000 Subject: [PATCH 119/148] Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default Bug: 280258727 Test: Found regression in b/286002292, local test. Change-Id: If6806124d79153824b6184bc10a5c10cea15823c Signed-off-by: paulsu --- powerhint-cheetah.json | 10 ---------- powerhint-panther.json | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 7a798de..090e924 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -646,16 +646,6 @@ ], "DefaultIndex": 0, "ResetOnInit": true - }, - { - "Name": "UgBgGroupThrottle", - "Path": "/proc/vendor_sched/ug_bg_group_throttle", - "Values": [ - "512", - "308" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [ diff --git a/powerhint-panther.json b/powerhint-panther.json index ff2eb27..d32ef83 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -626,16 +626,6 @@ ], "DefaultIndex": 0, "ResetOnInit": true - }, - { - "Name": "UgBgGroupThrottle", - "Path": "/proc/vendor_sched/ug_bg_group_throttle", - "Values": [ - "512", - "308" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [ From 89b7519ad4390b21a0a9ef98577da6bd61c691a7 Mon Sep 17 00:00:00 2001 From: Hasan Awais Date: Wed, 21 Jun 2023 16:43:15 +0000 Subject: [PATCH 120/148] uwb: update calibration for range bias Bug: 287082706 Test: build pass Signed-off-by: Hasan Awais (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:96fc698193615a817159fd24a207809f8be9ed1c) Merged-In: I1671dbae3a1a31120e8e15d0cec5e2346a186d53 Change-Id: I1671dbae3a1a31120e8e15d0cec5e2346a186d53 --- uwb/UWB-calibration-ce.conf | 6 +++--- uwb/UWB-calibration-default.conf | 6 +++--- uwb/UWB-calibration-fcc.conf | 6 +++--- uwb/UWB-calibration-jp.conf | 6 +++--- uwb/UWB-calibration-restricted.conf | 6 +++--- uwb/UWB-calibration-tw.conf | 6 +++--- uwb/UWB-calibration.conf | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index fae3dd9..f9fd8c7 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x53532B53 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16447 +ant0.ch5.prf64.ant_delay=16462 ant0.ch5.prf64.tx_power=0x53532B53 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409 ant0.ch9.prf16.tx_power=0x53532753 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16409 +ant0.ch9.prf64.ant_delay=16444 ant0.ch9.prf64.tx_power=0x53532753 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414 ant1.ch9.prf16.tx_power=0x47472347 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x34 -ant1.ch9.prf64.ant_delay=16414 +ant1.ch9.prf64.ant_delay=16427 ant1.ch9.prf64.tx_power=0x47472347 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x34 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 99020e6..c48282f 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x26 -ant0.ch5.prf64.ant_delay=16447 +ant0.ch5.prf64.ant_delay=16462 ant0.ch5.prf64.tx_power=0x67672F67 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x26 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409 ant0.ch9.prf16.tx_power=0x57572B57 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16409 +ant0.ch9.prf64.ant_delay=16444 ant0.ch9.prf64.tx_power=0x57572B57 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x26 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414 ant1.ch9.prf16.tx_power=0x47472347 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16414 +ant1.ch9.prf64.ant_delay=16427 ant1.ch9.prf64.tx_power=0x47472347 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x26 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 99020e6..c48282f 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x26 -ant0.ch5.prf64.ant_delay=16447 +ant0.ch5.prf64.ant_delay=16462 ant0.ch5.prf64.tx_power=0x67672F67 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x26 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409 ant0.ch9.prf16.tx_power=0x57572B57 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16409 +ant0.ch9.prf64.ant_delay=16444 ant0.ch9.prf64.tx_power=0x57572B57 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x26 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414 ant1.ch9.prf16.tx_power=0x47472347 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16414 +ant1.ch9.prf64.ant_delay=16427 ant1.ch9.prf64.tx_power=0x47472347 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x26 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 5e45dae..42e7d28 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0 -ant0.ch5.prf64.ant_delay=16447 +ant0.ch5.prf64.ant_delay=16462 ant0.ch5.prf64.tx_power=0 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409 ant0.ch9.prf16.tx_power=0x5F5F2F5F ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16409 +ant0.ch9.prf64.ant_delay=16444 ant0.ch9.prf64.tx_power=0x5F5F2F5F ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x26 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414 ant1.ch9.prf16.tx_power=0x3B3B1F3B ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16414 +ant1.ch9.prf64.ant_delay=16427 ant1.ch9.prf64.tx_power=0x3B3B1F3B ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x26 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 864381f..df92eb3 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x26 -ant0.ch5.prf64.ant_delay=16447 +ant0.ch5.prf64.ant_delay=16462 ant0.ch5.prf64.tx_power=0x67672F67 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x26 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409 ant0.ch9.prf16.tx_power=0x57572B57 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16409 +ant0.ch9.prf64.ant_delay=16444 ant0.ch9.prf64.tx_power=0x57572B57 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x26 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414 ant1.ch9.prf16.tx_power=0x47472347 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16414 +ant1.ch9.prf64.ant_delay=16427 ant1.ch9.prf64.tx_power=0x47472347 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x26 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index 853f60a..d9d6e84 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x26 -ant0.ch5.prf64.ant_delay=16447 +ant0.ch5.prf64.ant_delay=16462 ant0.ch5.prf64.tx_power=0x67672F67 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x26 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409 ant0.ch9.prf16.tx_power=0x57572B57 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16409 +ant0.ch9.prf64.ant_delay=16444 ant0.ch9.prf64.tx_power=0x57572B57 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x26 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414 ant1.ch9.prf16.tx_power=0x47472347 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16414 +ant1.ch9.prf64.ant_delay=16427 ant1.ch9.prf64.tx_power=0x47472347 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x26 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index f676eea..796507b 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x26 -ant0.ch5.prf64.ant_delay=16447 +ant0.ch5.prf64.ant_delay=16462 ant0.ch5.prf64.tx_power=0x67672F67 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x26 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16409 ant0.ch9.prf16.tx_power=0x5F5F2F5F ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16409 +ant0.ch9.prf64.ant_delay=16444 ant0.ch9.prf64.tx_power=0x5F5F2F5F ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x26 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16414 ant1.ch9.prf16.tx_power=0x47472347 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16414 +ant1.ch9.prf64.ant_delay=16427 ant1.ch9.prf64.tx_power=0x47472347 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x26 From 5066c38c4b644d2c470e29a7ed5697521e6d677f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 29 Jun 2023 20:56:51 +0000 Subject: [PATCH 121/148] Update panther SVN to 27 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1458db7674844d8288a52d908e31bf5f7d49b6ce) Merged-In: Ie26c777f0b7296d1d434d346e73504573f7882e4 Change-Id: Ie26c777f0b7296d1d434d346e73504573f7882e4 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 4518483..e0d2061 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=26 + ro.vendor.build.svn=27 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 58b2887fca294afc35873605e11608d35d50839e Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 29 Jun 2023 20:57:01 +0000 Subject: [PATCH 122/148] Update cheetah SVN to 27 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cab2f696b73dc762a4e55b36a3b6c3b04166c8fa) Merged-In: Ie89b86cf45ce9ca0c245161f2f23aa5287e94f86 Change-Id: Ie89b86cf45ce9ca0c245161f2f23aa5287e94f86 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 28e4897..986b0e1 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=26 + ro.vendor.build.svn=27 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 5f283f4365ab0acb21b819413473a57d18d26bdf Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sat, 5 Aug 2023 12:58:53 +0000 Subject: [PATCH 123/148] Update panther SVN to 28 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cc298fce7a0f3dea6b1b69afa62660c20e4da8a) Merged-In: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b Change-Id: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index e0d2061..a8966c2 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e40ba4af89f17ce0a3efa9589df0739deb46cd2e Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sat, 5 Aug 2023 12:59:07 +0000 Subject: [PATCH 124/148] Update cheetah SVN to 28 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f0a40932f9b8c6f454322a92c4c0ab8b5da70f24) Merged-In: I6739a8657ef0421cfb6389d52a00085598461734 Change-Id: I6739a8657ef0421cfb6389d52a00085598461734 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 986b0e1..c2ee733 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 96f08f80638a1772e8b4835825d54944998b082f Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sat, 5 Aug 2023 12:58:53 +0000 Subject: [PATCH 125/148] Update panther SVN to 28 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cc298fce7a0f3dea6b1b69afa62660c20e4da8a) Merged-In: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b Change-Id: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index e0d2061..a8966c2 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 9dabbe6ee6205f0d5b2017e095d5ed0a292a08e4 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sat, 5 Aug 2023 12:59:07 +0000 Subject: [PATCH 126/148] Update cheetah SVN to 28 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f0a40932f9b8c6f454322a92c4c0ab8b5da70f24) Merged-In: I6739a8657ef0421cfb6389d52a00085598461734 Change-Id: I6739a8657ef0421cfb6389d52a00085598461734 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 986b0e1..c2ee733 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 82b36361bacadf9139a5f2ca39b1d83601b96e0d Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sat, 5 Aug 2023 12:58:53 +0000 Subject: [PATCH 127/148] Update panther SVN to 28 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cc298fce7a0f3dea6b1b69afa62660c20e4da8a) Merged-In: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b Change-Id: Ic75f8b0cc00bedcf39215ef22afcf2ba2bd2c53b --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index e0d2061..a8966c2 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 14e3b34089537db4fefbaba345c55900f139e18a Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sat, 5 Aug 2023 12:59:07 +0000 Subject: [PATCH 128/148] Update cheetah SVN to 28 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f0a40932f9b8c6f454322a92c4c0ab8b5da70f24) Merged-In: I6739a8657ef0421cfb6389d52a00085598461734 Change-Id: I6739a8657ef0421cfb6389d52a00085598461734 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 986b0e1..c2ee733 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 5f84bb10e9c42cc86ed94e4ff13e3bcc3b97df92 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 9 Aug 2023 18:10:57 +0000 Subject: [PATCH 129/148] Update panther SVN to 29 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fcc94dbbba4cced0058a7bb1ccbaae1a3e111f08) Merged-In: I32e95791efd794fef0ceb0152ccd7d35acc9c3af Change-Id: I32e95791efd794fef0ceb0152ccd7d35acc9c3af --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index a8966c2..51a85c2 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 4870fda0e12d9240d26b20fd60c814130550fe55 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 9 Aug 2023 18:11:08 +0000 Subject: [PATCH 130/148] Update cheetah SVN to 29 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5c4d787b20f294e4f33e1788013c158d97a4ad2f) Merged-In: I2b4e47655792f1772fe9f04d3d85730664d50e0e Change-Id: I2b4e47655792f1772fe9f04d3d85730664d50e0e --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index c2ee733..79394fc 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ce4c12ed111121cb2e20d2509428e11ef53d2d57 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 19:57:50 +0000 Subject: [PATCH 131/148] Update cheetah SVN to 30 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e18ad19f223e011e70a5dbc082587ac9e9179f0) Merged-In: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b Change-Id: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 79394fc..d7a16db 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a1424fd67623e09096a73401d99844399eb1957d Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 19:57:35 +0000 Subject: [PATCH 132/148] Update panther SVN to 30 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:015cd3bc50168e8bc2039097f123aa2b26093fb5) Merged-In: I52424c33d2390294512a796bd1db963e32ffa350 Change-Id: I52424c33d2390294512a796bd1db963e32ffa350 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 51a85c2..d7cac3a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 11191a4102277d501b680ad9e4a46c7c224ce5fb Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 19:57:50 +0000 Subject: [PATCH 133/148] Update cheetah SVN to 30 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e18ad19f223e011e70a5dbc082587ac9e9179f0) Merged-In: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b Change-Id: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 79394fc..d7a16db 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 1f3947c69ce15304225a36191dfeb67e4c74a1ae Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 19:57:35 +0000 Subject: [PATCH 134/148] Update panther SVN to 30 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:015cd3bc50168e8bc2039097f123aa2b26093fb5) Merged-In: I52424c33d2390294512a796bd1db963e32ffa350 Change-Id: I52424c33d2390294512a796bd1db963e32ffa350 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 51a85c2..d7cac3a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a5401dbe46a0e45cbfea41a906cc05d537e01d7e Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 19:57:50 +0000 Subject: [PATCH 135/148] Update cheetah SVN to 30 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e18ad19f223e011e70a5dbc082587ac9e9179f0) Merged-In: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b Change-Id: I933a35d40ff3bb8a94c99aa6c2cef1787695e56b --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 79394fc..d7a16db 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 0f9ef1b294fd1161b379e4ba02ae16964d7d3d17 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 19:57:35 +0000 Subject: [PATCH 136/148] Update panther SVN to 30 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:015cd3bc50168e8bc2039097f123aa2b26093fb5) Merged-In: I52424c33d2390294512a796bd1db963e32ffa350 Change-Id: I52424c33d2390294512a796bd1db963e32ffa350 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 51a85c2..d7cac3a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=29 + ro.vendor.build.svn=30 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 9ebb83dc98772fc2b6d77419ae3d13e74fb5aa07 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 15 Aug 2023 00:11:13 +0000 Subject: [PATCH 137/148] Update panther SVN to 31 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:570b3d6c1f12ec5609a6a6833b95d495374112d9) Merged-In: I24aca791a53e22a936154123390d608cc4c4dffa Change-Id: I24aca791a53e22a936154123390d608cc4c4dffa --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index d7cac3a..dde9314 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 182b9db73618210e4f291b1a82ca7f181e862887 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 15 Aug 2023 00:11:23 +0000 Subject: [PATCH 138/148] Update cheetah SVN to 31 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ae7e08a40af771631288df814e8b807eb16d855) Merged-In: I95e72852e47c578c1b6fcc1c7be2bba9986f85d1 Change-Id: I95e72852e47c578c1b6fcc1c7be2bba9986f85d1 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index d7a16db..4e5623f 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=30 + ro.vendor.build.svn=31 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From c58211f2e79a40b7246b0d026b3939c1927d7c86 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Thu, 27 Jul 2023 13:46:04 +0800 Subject: [PATCH 139/148] gps: Disable Vzw SUPL OTDOA Bug: 293213801 Test: OTDOA disabled (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:95eefc6f32e88beda3a5e862ee5e5d560ac8a231) Merged-In: I65b09dd2c0a0154a765218daa42f8ef6905bcf92 Change-Id: I65b09dd2c0a0154a765218daa42f8ef6905bcf92 --- location/gps.xml | 2 +- location/gps.xml.c10 | 2 +- location/gps.xml.p10 | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.c10 | 2 +- location/gps_user.xml.p10 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 98eb66d..77fec48 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index a14f956..6ad7053 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index bb1f1ae..2e13754 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 45ddef9..3af6cca 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 301b2a2..d4f596b 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index ff7ba73..cf367e7 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From c8577dbf14490f8a006d948a362d374f74c2587a Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:39:19 +0000 Subject: [PATCH 140/148] Update cheetah SVN to 32 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2ea95af0032b5985b2eb964e2772c80aa4dff4b) Merged-In: I68b893cae48139fc6188b4eb8a306849b0f6a8ec Change-Id: I68b893cae48139fc6188b4eb8a306849b0f6a8ec --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4e5623f..a186a90 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 09d77b7c7308ac85f8c63fbf000c7516668f2656 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:39:08 +0000 Subject: [PATCH 141/148] Update panther SVN to 32 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce0e01fc1afebbd6d35c0b91dc2861974ee94edc) Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2 Change-Id: I83852b7c11925d054ef38442f3cbd564c59866a2 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index dde9314..38b1b31 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 93811f9b9ae8958087e062cdc1e3a0c6227ad365 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:39:19 +0000 Subject: [PATCH 142/148] Update cheetah SVN to 32 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2ea95af0032b5985b2eb964e2772c80aa4dff4b) Merged-In: I68b893cae48139fc6188b4eb8a306849b0f6a8ec Change-Id: I68b893cae48139fc6188b4eb8a306849b0f6a8ec --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4e5623f..a186a90 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From c1eba80c111bc935261839b63868955ae3c641c7 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:39:08 +0000 Subject: [PATCH 143/148] Update panther SVN to 32 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce0e01fc1afebbd6d35c0b91dc2861974ee94edc) Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2 Change-Id: I83852b7c11925d054ef38442f3cbd564c59866a2 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index dde9314..38b1b31 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 66b7ebc849390ea60ae85c8d540f205f9fec07c1 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:39:19 +0000 Subject: [PATCH 144/148] Update cheetah SVN to 32 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2ea95af0032b5985b2eb964e2772c80aa4dff4b) Merged-In: I68b893cae48139fc6188b4eb8a306849b0f6a8ec Change-Id: I68b893cae48139fc6188b4eb8a306849b0f6a8ec --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4e5623f..a186a90 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From dedb943acdd8d5c3a1289481a3c922a80a0f4c54 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:39:08 +0000 Subject: [PATCH 145/148] Update panther SVN to 32 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce0e01fc1afebbd6d35c0b91dc2861974ee94edc) Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2 Change-Id: I83852b7c11925d054ef38442f3cbd564c59866a2 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index dde9314..38b1b31 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 7cbb9f04e927a3b636e621e4ebcdaf0bd963494d Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:39:19 +0000 Subject: [PATCH 146/148] Update cheetah SVN to 32 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d2ea95af0032b5985b2eb964e2772c80aa4dff4b) Merged-In: I68b893cae48139fc6188b4eb8a306849b0f6a8ec Change-Id: I68b893cae48139fc6188b4eb8a306849b0f6a8ec --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4e5623f..a186a90 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 254fd674a19777aaa9ba849207af0be9ebd323ea Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:39:08 +0000 Subject: [PATCH 147/148] Update panther SVN to 32 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce0e01fc1afebbd6d35c0b91dc2861974ee94edc) Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2 Change-Id: I83852b7c11925d054ef38442f3cbd564c59866a2 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index dde9314..38b1b31 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=32 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e28ced4930580b33fef85877ec4c3def710adb77 Mon Sep 17 00:00:00 2001 From: Xin Li Date: Fri, 8 Sep 2023 11:33:38 -0700 Subject: [PATCH 148/148] Set the blew prebuilt apps to PRESIGNED Keep PixelQualifiedNetworksService platfrom key Other apps are no need to re-sign Bug: 290766628 Change-Id: I90c6f1cf423baf2f5ca42440b5e020f005360f49 --- self-extractors_cheetah/google_devices/staging/Android.mk | 6 +++--- self-extractors_panther/google_devices/staging/Android.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/self-extractors_cheetah/google_devices/staging/Android.mk b/self-extractors_cheetah/google_devices/staging/Android.mk index 8982deb..0e329a3 100644 --- a/self-extractors_cheetah/google_devices/staging/Android.mk +++ b/self-extractors_cheetah/google_devices/staging/Android.mk @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -64,7 +64,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -80,7 +80,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := qorvo LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE diff --git a/self-extractors_panther/google_devices/staging/Android.mk b/self-extractors_panther/google_devices/staging/Android.mk index 763f1fb..7e7906a 100644 --- a/self-extractors_panther/google_devices/staging/Android.mk +++ b/self-extractors_panther/google_devices/staging/Android.mk @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -64,7 +64,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE