From 4c0162c926d24485a5683502506f3b226f14f429 Mon Sep 17 00:00:00 2001 From: kuanyuhuang Date: Wed, 10 May 2023 08:02:43 +0000 Subject: [PATCH 01/75] BT CHRE: AOC control BT power pin config Let AOC control BT power pin at specific hardware stages Test: make and check BT CHRE power control command Bug: 281793463 Change-Id: I3acf11db94fb1fd46efac9582c5b53243e7dfcc2 --- bluetooth/bt_vendor_overlay.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index b253158..9383086 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -6,6 +6,10 @@ UartPort = /dev/ttySAC18 # Enable check whether let aoc controls power pin AocPowerPinCtrlCheckEnable = true +# The hardware stage does not need aoc to control power pin +# This only affects when AocPowerPinCtrlCheckEnable is true +HwStageDoesNotCtrlPowerPinFromAoc = PROTO1.0-EVT1.0-EVT1.2 + # Sar backOff high resolution support SarBackOffHighResolution = true From f5bd1f1e7d85181a3dceaa9cbc1bf45b3eff606e Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 1 Jun 2023 07:15:16 +0000 Subject: [PATCH 02/75] audio: update audio AIDL config files - remove audio_policy_configuration.xml - add in-call-capture paths - add "PCM Soft Ramp" for speaker amp - set default "Digital PCM Volume" to 0 - set "AoC Chirp Enable" in "speaker-earpiece (VOICE)" Bug: 206737711 Test: mm Change-Id: Iafedbc05b75b689f2dd3bb55792f282ca39e7c21 --- .../audio_policy_configuration.xml | 215 ------------------ audio/husky/aidl_config/mixer_paths_aidl.xml | 65 +++++- audio/husky/audio-tables.mk | 1 - .../audio_policy_configuration.xml | 215 ------------------ audio/shiba/aidl_config/mixer_paths_aidl.xml | 65 +++++- audio/shiba/audio-tables.mk | 1 - 6 files changed, 120 insertions(+), 442 deletions(-) delete mode 100644 audio/husky/aidl_config/audio_policy_configuration.xml delete mode 100644 audio/shiba/aidl_config/audio_policy_configuration.xml diff --git a/audio/husky/aidl_config/audio_policy_configuration.xml b/audio/husky/aidl_config/audio_policy_configuration.xml deleted file mode 100644 index c93d1cb..0000000 --- a/audio/husky/aidl_config/audio_policy_configuration.xml +++ /dev/null @@ -1,215 +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/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 8b2b0e4..9dfffab 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -79,8 +79,8 @@ - - + + @@ -97,6 +97,8 @@ + + @@ -315,6 +317,7 @@ + @@ -657,9 +660,41 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -679,6 +714,7 @@ + @@ -686,6 +722,8 @@ + + @@ -697,6 +735,8 @@ + + @@ -713,6 +753,7 @@ + @@ -721,6 +762,7 @@ + @@ -778,6 +820,19 @@ + + + + + + + + + + + + + diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index 0248b04..c177750 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -21,7 +21,6 @@ AUDIO_TABLE_FOLDER := husky ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml diff --git a/audio/shiba/aidl_config/audio_policy_configuration.xml b/audio/shiba/aidl_config/audio_policy_configuration.xml deleted file mode 100644 index c93d1cb..0000000 --- a/audio/shiba/aidl_config/audio_policy_configuration.xml +++ /dev/null @@ -1,215 +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/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 8b2b0e4..9dfffab 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -79,8 +79,8 @@ - - + + @@ -97,6 +97,8 @@ + + @@ -315,6 +317,7 @@ + @@ -657,9 +660,41 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -679,6 +714,7 @@ + @@ -686,6 +722,8 @@ + + @@ -697,6 +735,8 @@ + + @@ -713,6 +753,7 @@ + @@ -721,6 +762,7 @@ + @@ -778,6 +820,19 @@ + + + + + + + + + + + + + diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index 508e15a..b1d8cbc 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -21,7 +21,6 @@ AUDIO_TABLE_FOLDER := shiba ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml From e5c5310a1223e2365ee0b3502a13f7f245043a24 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Thu, 8 Jun 2023 15:46:49 +0800 Subject: [PATCH 03/75] audio: control current limit specifically This value will be changed by battery throttling, so separating this from reqular path control. Bug: 274373213 Test: manual test Change-Id: I19b59d188855e05907e12e8340aadebb47cef9b0 Signed-off-by: Jasmine Cha --- audio/husky/aidl_config/mixer_paths_aidl.xml | 40 +++++++++++++++++--- audio/shiba/aidl_config/mixer_paths_aidl.xml | 40 +++++++++++++++++--- 2 files changed, 68 insertions(+), 12 deletions(-) diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 8b2b0e4..13cd5c2 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -682,15 +682,12 @@ - - - @@ -700,8 +697,6 @@ - - @@ -716,7 +711,6 @@ - @@ -861,4 +855,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 8b2b0e4..13cd5c2 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -682,15 +682,12 @@ - - - @@ -700,8 +697,6 @@ - - @@ -716,7 +711,6 @@ - @@ -861,4 +855,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b2b86f9338f87ff3604f5bd988262d2596e09c91 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Mon, 22 May 2023 17:42:33 +0800 Subject: [PATCH 04/75] audio: add HDMI device handler Bug: 264508873 Test: verified on test build Change-Id: I9ab084232f0dcaa03546de11d134c28f82a8f232 Signed-off-by: Carter Hsu --- audio/husky/config/audio_platform_configuration.xml | 1 + audio/shiba/config/audio_platform_configuration.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 84c045b..75d0567 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -300,6 +300,7 @@ + diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 84c045b..75d0567 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -300,6 +300,7 @@ + From 1cfda0e0431eb43dd7eb471ab6fb0248df3b5ad8 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Mon, 20 Feb 2023 09:11:52 +0800 Subject: [PATCH 05/75] audio: add hdmi path Bug: 264508873 Test: verified on test build Change-Id: I85a5df9e4f3404219c1c7f33ebe368063b3a9706 Signed-off-by: Carter Hsu --- audio/husky/config/audio_policy_configuration.xml | 4 +++- audio/husky/config/mixer_paths.xml | 6 ++++++ audio/shiba/config/audio_policy_configuration.xml | 4 +++- audio/shiba/config/mixer_paths.xml | 6 ++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml index a859ac1..524f102 100644 --- a/audio/husky/config/audio_policy_configuration.xml +++ b/audio/husky/config/audio_policy_configuration.xml @@ -149,7 +149,7 @@ - + @@ -228,6 +228,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + + + + + + + diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml index a859ac1..524f102 100644 --- a/audio/shiba/config/audio_policy_configuration.xml +++ b/audio/shiba/config/audio_policy_configuration.xml @@ -149,7 +149,7 @@ - + @@ -228,6 +228,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + + + + + + + From 419e9ec104d0f70f2dd01702d360e4b75b73eec1 Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Wed, 24 May 2023 13:40:41 -0700 Subject: [PATCH 06/75] shusky/vibrator: Enable adaptive alert vibration Enable the adaptive alert vibration feature for shusky devices. Bug: 284181186 Test: atest PtsVibratorHalTestSuite \ PtsHapticsTestCases \ VibratorHalCs40l26TestSuite \ VtsHalVibratorManagerTargetTest \ VtsHalVibratorTargetTest \ android.os.cts.VibratorTest \ android.os.cts.VibratorManagerTest \ android.os.cts.VibrationEffectTest \ android.os.cts.VibrationAttributesTest \ android.os.cts.CombinedVibrationTest Change-Id: I68d7e1d12e7ac64a0b529f26aa36a027984cfc73 Signed-off-by: Chris Paulo --- device-husky.mk | 8 +++++++- device-shiba.mk | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index efc8148..7e41574 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -304,10 +304,16 @@ PRODUCT_COPY_FILES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 +ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.222 \ - ro.vendor.vibrator.hal.loc.coeff=2.8 + ro.vendor.vibrator.hal.loc.coeff=2.8 \ + persist.vendor.vibrator.hal.context.enable=false \ + persist.vendor.vibrator.hal.context.scale=60 \ + persist.vendor.vibrator.hal.context.fade=true \ + persist.vendor.vibrator.hal.context.cooldowntime=1600 \ + persist.vendor.vibrator.hal.context.settlingtime=5000 # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 885d4ea..a710ea0 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -284,10 +284,16 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 +ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.187 \ - ro.vendor.vibrator.hal.loc.coeff=2.75 + ro.vendor.vibrator.hal.loc.coeff=2.75 \ + persist.vendor.vibrator.hal.context.enable=false \ + persist.vendor.vibrator.hal.context.scale=60 \ + persist.vendor.vibrator.hal.context.fade=true \ + persist.vendor.vibrator.hal.context.cooldowntime=1600 \ + persist.vendor.vibrator.hal.context.settlingtime=5000 # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ From 113284252515052971d919dc42c27203c6f7ba46 Mon Sep 17 00:00:00 2001 From: Hsiu-Chang Chen Date: Tue, 27 Jun 2023 12:02:49 +0800 Subject: [PATCH 07/75] wifi: convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable Bug: 287607876 Test: SAR scenario is set properly with motion sensor status Change-Id: I0b57100b7d21b8c1ddf3c459e014ebbd1501752e --- wifi/BoardConfig-wifi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index fdc7409..4710298 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -36,3 +36,5 @@ PRODUCT_COPY_FILES += \ device/google/shusky/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ device/google/shusky/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf +# Add WIFI_FEATURE_IMU_DETECTION to soong_config +$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION)) From 13fbb117f6400c7858f06ba99d2602954033e8b5 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 28 Jun 2023 16:36:30 +0800 Subject: [PATCH 08/75] audio: move controls for acoustic shock and battey throttle. Bug: 274373213 Test: manual voip test/ device, host test vendor.google.whitechapel.audio.hal.audio.tuner_device_tests vendor.google.whitechapel.audio.hal.audio.tuner_tests Change-Id: I9d0d67beb1e78258f390801b3a4c9ac92bd06bf1 Signed-off-by: Jasmine Cha --- audio/husky/aidl_config/mixer_paths_aidl.xml | 61 ++++++++++++++------ audio/shiba/aidl_config/mixer_paths_aidl.xml | 61 ++++++++++++++------ 2 files changed, 84 insertions(+), 38 deletions(-) diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 57cbd95..b04805d 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -714,7 +714,6 @@ - @@ -722,7 +721,6 @@ - @@ -732,8 +730,6 @@ - - @@ -747,8 +743,6 @@ - - @@ -756,7 +750,6 @@ - @@ -910,38 +903,68 @@ - - + + + + + + + + + + - + + + - + + - + + - + + - + + - + + + - + + + + + + + + + - + + + + + + - + + - + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 57cbd95..b04805d 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -714,7 +714,6 @@ - @@ -722,7 +721,6 @@ - @@ -732,8 +730,6 @@ - - @@ -747,8 +743,6 @@ - - @@ -756,7 +750,6 @@ - @@ -910,38 +903,68 @@ - - + + + + + + + + + + - + + + - + + - + + - + + - + + - + + + - + + + + + + + + + - + + + + + + - + + - + From 275d998342fa1af455b561a249bb4757f2dfb016 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Thu, 6 Jul 2023 16:06:53 -0400 Subject: [PATCH 09/75] Manually tune rounded_corner_radius for Husky Built and tested on Husky. Tested by setting a gray wallpaper and getting the rounded corner rect to apply via begnning a gesture nav event. Test: manual Bug: 284742800 Change-Id: I5b8121311bddbda10ff19df2bfc4e1f9cedd9d23 --- .../overlay/frameworks/base/core/res/res/values/dimens.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/husky/overlay/frameworks/base/core/res/res/values/dimens.xml b/husky/overlay/frameworks/base/core/res/res/values/dimens.xml index 945f37a..8fa69f3 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -19,9 +19,9 @@ - 115px - 118px - 115px + 91px + 91px + 91px + 100 + 1 diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 4f29894..a67e26b 100644 --- a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -55,6 +55,9 @@ Z + + 100 + 1 From 052c18b3e03641e4809f3302d6b3572430f50181 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Fri, 14 Jul 2023 06:57:41 +0000 Subject: [PATCH 11/75] aidl: sthal: add support for aec record in mixer table note: This table is only used by AIDL Sthal. Bug: 291186942 Test: end-to-end enable path by quick phrase. Change-Id: I3b9e6ca77b70e3a95456c5553d91dbebf4c0ef17 --- audio/husky/aidl_config/mixer_paths_aidl.xml | 22 ++++++++++---------- audio/shiba/aidl_config/mixer_paths_aidl.xml | 22 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index b04805d..de79b5f 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -787,6 +787,17 @@ + + + + + + + + + + + @@ -830,17 +841,6 @@ - - - - - - - - - - - diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index b04805d..de79b5f 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -787,6 +787,17 @@ + + + + + + + + + + + @@ -830,17 +841,6 @@ - - - - - - - - - - - From 2e2c31cea81afceb534aa15dcb88b41152fbd7bf Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 11 Jul 2023 16:35:55 +0800 Subject: [PATCH 12/75] audio: sync cca setting from hidl Bug: 289859350 Test: build pass Change-Id: I66c28ced092189fce199eb8c8250c2bf836ac4af Signed-off-by: Jasmine Cha --- audio/husky/aidl_config/audio_platform_configuration_aidl.xml | 2 +- audio/shiba/aidl_config/audio_platform_configuration_aidl.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml b/audio/husky/aidl_config/audio_platform_configuration_aidl.xml index ef8fe23..64e6593 100644 --- a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml +++ b/audio/husky/aidl_config/audio_platform_configuration_aidl.xml @@ -70,7 +70,7 @@ - + diff --git a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml b/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml index ef8fe23..64e6593 100644 --- a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml +++ b/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml @@ -70,7 +70,7 @@ - + From 0e2af5bf1dfb3ce3021c65afd180e340b6034d5e Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Thu, 20 Jul 2023 09:10:44 +0800 Subject: [PATCH 13/75] audio: add HDMI support on ripcurrent Bug: 264508873 Test: build pass Change-Id: I91cfd4b7e028927a5036f1772cfc6a5aa725d650 Signed-off-by: Carter Hsu --- audio/ripcurrent/config/audio_platform_configuration.xml | 1 + audio/ripcurrent/config/audio_policy_configuration.xml | 4 +++- .../audio_policy_configuration_a2dp_offload_disabled.xml | 4 +++- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 4 +++- .../audio_policy_configuration_le_offload_disabled.xml | 4 +++- audio/ripcurrent/config/mixer_paths.xml | 6 ++++++ 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml index 1aab4e6..2435e98 100644 --- a/audio/ripcurrent/config/audio_platform_configuration.xml +++ b/audio/ripcurrent/config/audio_platform_configuration.xml @@ -295,6 +295,7 @@ + diff --git a/audio/ripcurrent/config/audio_policy_configuration.xml b/audio/ripcurrent/config/audio_policy_configuration.xml index c53bfe2..2620d7f 100644 --- a/audio/ripcurrent/config/audio_policy_configuration.xml +++ b/audio/ripcurrent/config/audio_policy_configuration.xml @@ -148,7 +148,7 @@ - + @@ -227,6 +227,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + - + @@ -183,6 +183,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + - + @@ -179,6 +179,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/> + - + @@ -204,6 +204,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + + + + + + + From a782655d545a342f2fc8b42afc1fde0a0ea3e2e7 Mon Sep 17 00:00:00 2001 From: David Chao Date: Fri, 21 Jul 2023 06:52:48 +0000 Subject: [PATCH 14/75] thermal: update powerhints for thermal trips Add switch on/off to remove dependency on powerhint.json when updating thermal thresholds Bug: 283038681 Test: Build and boot on device Change-Id: Ibf318176ba5e2c51b2989080c860560f1f1351a0 --- perf/powerhint-husky.json | 228 ++++++++-------------------------- perf/powerhint-shiba.json | 250 ++++++++------------------------------ 2 files changed, 96 insertions(+), 382 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index d288d84..f5e7562 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -448,121 +448,61 @@ "ResetOnInit": true }, { - "Name": "BigControlTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Name": "BigTjOffset", + "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", "Values": [ - "95000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "MidControlTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Name": "MidTjOffset", + "Path": "/sys/devices/platform/100a0000.MID/offset_enabled", "Values": [ - "95000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "LittleControlTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Name": "LittleTjOffset", + "Path": "/sys/devices/platform/100a0000.LITTLE/offset_enabled", "Values": [ - "100000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "G3dControlTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Name": "G3dTjOffset", + "Path": "/sys/devices/platform/100b0000.G3D/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "TpuControlTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_2_temp", + "Name": "TpuTjOffset", + "Path": "/sys/devices/platform/100b0000.TPU/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "AurControlTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_2_temp", + "Name": "AurTjOffset", + "Path": "/sys/devices/platform/100b0000.AUR/offset_enabled", "Values": [ - "85000", - "80000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "BigSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", - "Values": [ - "75000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "MidSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", - "Values": [ - "75000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "LittleSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", - "Values": [ - "75000", - "65000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "G3dSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "TpuSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "AurSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_1_temp", - "Values": [ - "65000", - "60000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false @@ -2177,75 +2117,39 @@ }, { "PowerHint": "LOW_POWER", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "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": "65000" - }, - { - "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" + "Value": "1" }, { "PowerHint": "REFRESH_120FPS", @@ -2350,75 +2254,39 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index be39284..80e5d27 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -438,131 +438,61 @@ "ResetOnInit": true }, { - "Name": "BigControlTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Name": "BigTjOffset", + "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", "Values": [ - "90000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "MidControlTempSet", - "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Name": "MidTjOffset", + "Path": "/sys/devices/platform/100a0000.MID/offset_enabled", "Values": [ - "90000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "LittleControlTempSet", - "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Name": "LittleTjOffset", + "Path": "/sys/devices/platform/100a0000.LITTLE/offset_enabled", "Values": [ - "95000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "G3dControlTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Name": "G3dTjOffset", + "Path": "/sys/devices/platform/100b0000.G3D/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "TpuControlTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_2_temp", + "Name": "TpuTjOffset", + "Path": "/sys/devices/platform/100b0000.TPU/offset_enabled", "Values": [ - "85000", - "80000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false }, { - "Name": "AurControlTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_2_temp", + "Name": "AurTjOffset", + "Path": "/sys/devices/platform/100b0000.AUR/offset_enabled", "Values": [ - "85000", - "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", - "65000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "G3dSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "TpuSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/TPU/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "AurSwitchOnTempSet", - "Path": "/dev/thermal/tz-by-name/AUR/trip_point_1_temp", - "Values": [ - "65000", - "60000" - ], - "DefaultIndex": 0, - "ResetOnInit": false - }, - { - "Name": "BigEarlyThrottlingTempSet", - "Path": "/dev/thermal/tz-by-name/BIG/trip_point_4_temp", - "Values": [ - "80000", - "85000" + "0", + "1" ], "DefaultIndex": 0, "ResetOnInit": false @@ -2075,81 +2005,39 @@ }, { "PowerHint": "LOW_POWER", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "LOW_POWER", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "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": "65000" - }, - { - "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": "LOW_POWER", - "Node": "BigEarlyThrottlingTempSet", - "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "REFRESH_120FPS", @@ -2254,81 +2142,39 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigControlTempSet", + "Node": "BigTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidControlTempSet", + "Node": "MidTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleControlTempSet", + "Node": "LittleTjOffset", "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dControlTempSet", + "Node": "G3dTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuControlTempSet", + "Node": "TpuTjOffset", "Duration": 0, - "Value": "80000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurControlTempSet", + "Node": "AurTjOffset", "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "65000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", - "Node": "BigEarlyThrottlingTempSet", - "Duration": 0, - "Value": "85000" + "Value": "1" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", From cf40ac3383babbaeda6d96bf45a702affab33f44 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Fri, 21 Jul 2023 10:37:34 +0800 Subject: [PATCH 15/75] Add broadcast capabilities to support 48_4 & 48_2 Bug: 292538449 Test: broadcast streaming via offload path. Change-Id: I325f2ab083442acd7ff8994b463781d0e5971052 --- 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 9dcdd01..f277589 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -47,6 +47,8 @@ + + @@ -65,6 +67,8 @@ + + @@ -73,6 +77,7 @@ + From dbc0ad4d25e01f8d6a170ba2f93d705b709674be Mon Sep 17 00:00:00 2001 From: weichinweng Date: Tue, 25 Jul 2023 06:05:30 +0000 Subject: [PATCH 16/75] Enable Bluetooth CHRE feature on bt_vendor.conf Bug: 292853832 Test: Enable Bluetooth, make sure it will go the AOC path. Change-Id: I017971d2eb95fefac152bbb466c38a7830672f02 --- bluetooth/bt_vendor_overlay.conf | 3 +++ bluetooth/bt_vendor_overlay_ripcurrent.conf | 3 +++ 2 files changed, 6 insertions(+) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index dc30336..37c1900 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -3,6 +3,9 @@ # Uart port name UartPort = /dev/ttySAC18 +# Userial type +UserialType = 2 + # Enable check whether let aoc controls power pin AocPowerPinCtrlCheckEnable = true diff --git a/bluetooth/bt_vendor_overlay_ripcurrent.conf b/bluetooth/bt_vendor_overlay_ripcurrent.conf index 2473a1b..a4a91d5 100644 --- a/bluetooth/bt_vendor_overlay_ripcurrent.conf +++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf @@ -3,6 +3,9 @@ # Uart port name UartPort = /dev/ttySAC18 +# Userial type +UserialType = 2 + # Sar backOff high resolution support SarBackOffHighResolution = true From ea872f817267acb9cb323093f6dc2d66c88f7cd1 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Fri, 21 Jul 2023 09:47:01 +0800 Subject: [PATCH 17/75] audio: adding HDMI to all policy configurations Bug: 264508873 Test: build pass Change-Id: I3a55089732bee260817ea28874a92d8ae5b9b4f3 Signed-off-by: Carter Hsu --- .../audio_policy_configuration_a2dp_offload_disabled.xml | 4 +++- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 4 +++- .../config/audio_policy_configuration_le_offload_disabled.xml | 4 +++- .../audio_policy_configuration_a2dp_offload_disabled.xml | 4 +++- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 4 +++- .../config/audio_policy_configuration_le_offload_disabled.xml | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml index 78b7ee8..4878bc5 100644 --- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -149,7 +149,7 @@ - + @@ -184,6 +184,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + - + @@ -180,6 +180,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/> + - + @@ -205,6 +205,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + - + @@ -184,6 +184,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + - + @@ -180,6 +180,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/> + - + @@ -205,6 +205,8 @@ sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/> + Date: Tue, 18 Jul 2023 13:46:05 +0200 Subject: [PATCH 18/75] Refactor fullmte bits into common dir Pull fullmte-common and fullmte-vars into a common dir so they can also be used by other devices. See the topic changes for device/google/gs-common. Bug: 288843255 Test: run soong for shiba_fullmte, build/flash husky_fullmte. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dc02c7176f592d00610ca5db3648f90194434c2d) Merged-In: I6cc636596acff8b5234197fe26f85e27f7e85a62 Change-Id: I6cc636596acff8b5234197fe26f85e27f7e85a62 cherry-pick to udc-qpr-dev --- aosp_husky_fullmte.mk | 3 +-- aosp_ripcurrent_fullmte.mk | 3 +-- aosp_shiba_fullmte.mk | 3 +-- fullmte-common.mk | 2 -- fullmte-vars.mk | 4 ---- 5 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 fullmte-common.mk delete mode 100644 fullmte-vars.mk diff --git a/aosp_husky_fullmte.mk b/aosp_husky_fullmte.mk index a8429e5..06a5db0 100644 --- a/aosp_husky_fullmte.mk +++ b/aosp_husky_fullmte.mk @@ -1,5 +1,4 @@ -include device/google/shusky/fullmte-vars.mk +include device/google/gs-common/mte/fullmte-pixel.mk $(call inherit-product, device/google/shusky/aosp_husky.mk) -$(call inherit-product, device/google/shusky/fullmte-common.mk) PRODUCT_NAME := aosp_husky_fullmte diff --git a/aosp_ripcurrent_fullmte.mk b/aosp_ripcurrent_fullmte.mk index 781137a..b7dc289 100644 --- a/aosp_ripcurrent_fullmte.mk +++ b/aosp_ripcurrent_fullmte.mk @@ -1,5 +1,4 @@ -include device/google/shusky/fullmte-vars.mk +include device/google/gs-common/mte/fullmte-pixel.mk $(call inherit-product, device/google/shusky/aosp_ripcurrent.mk) -$(call inherit-product, device/google/shusky/fullmte-common.mk) PRODUCT_NAME := aosp_ripcurrent_fullmte diff --git a/aosp_shiba_fullmte.mk b/aosp_shiba_fullmte.mk index 76333e0..8f31bd5 100644 --- a/aosp_shiba_fullmte.mk +++ b/aosp_shiba_fullmte.mk @@ -1,5 +1,4 @@ -include device/google/shusky/fullmte-vars.mk +include device/google/gs-common/mte/fullmte-pixel.mk $(call inherit-product, device/google/shusky/aosp_shiba.mk) -$(call inherit-product, device/google/shusky/fullmte-common.mk) PRODUCT_NAME := aosp_shiba_fullmte diff --git a/fullmte-common.mk b/fullmte-common.mk deleted file mode 100644 index 1591a33..0000000 --- a/fullmte-common.mk +++ /dev/null @@ -1,2 +0,0 @@ -BOARD_KERNEL_CMDLINE += bootloader.pixel.MTE_FORCE_ON -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync diff --git a/fullmte-vars.mk b/fullmte-vars.mk deleted file mode 100644 index c8c87ff..0000000 --- a/fullmte-vars.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),) - SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap memtag_stack) - SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap) -endif From ad520e59a4d52f3ef427bfcc74457d7aeba370ea Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Mon, 26 Jun 2023 03:32:50 +0000 Subject: [PATCH 19/75] gps: separate gps build system to device Bug: 288813677 Test: compile for different devices and check binary. Test: verification test at b/288813677 Change-Id: I7591af58423d4d2826a7c5e9ba166ed0e729d932 --- device-husky.mk | 10 ++++++++++ device-ripcurrent.mk | 10 ++++++++++ device-shiba.mk | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index e61db63..0664d09 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -238,6 +238,16 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts # Location +# SDK build system +ifneq ($(BOARD_WITHOUT_RADIO),true) +# Release stable version to factory image +ifneq ($(filter factory_%,$(TARGET_PRODUCT)),) + include device/google/gs-common/gps/brcm/device.mk +else + include device/google/gs-common/gps/brcm/device_v2.mk +endif +endif + PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 87ce735..77d5c9b 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -203,6 +203,16 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts # Location +# SDK build system +ifneq ($(BOARD_WITHOUT_RADIO),true) +# Release stable version to factory image +ifneq ($(filter factory_%,$(TARGET_PRODUCT)),) + include device/google/gs-common/gps/brcm/device.mk +else + include device/google/gs-common/gps/brcm/device_v2.mk +endif +endif + PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/device-shiba.mk b/device-shiba.mk index 1737971..b0e7927 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -229,6 +229,16 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts # Location +# SDK build system +ifneq ($(BOARD_WITHOUT_RADIO),true) +# Release stable version to factory image +ifneq ($(filter factory_%,$(TARGET_PRODUCT)),) + include device/google/gs-common/gps/brcm/device.mk +else + include device/google/gs-common/gps/brcm/device_v2.mk +endif +endif + PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer From 34bdf990c8a2f96788a1a1b905e37f02d1db40c7 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Fri, 28 Jul 2023 10:51:26 +0800 Subject: [PATCH 20/75] audio: udpate CCA default value Bug: 293550905 Test: build pass Change-Id: I0946b88e4fd5d3b86f4d25fd4729b29ff1ef2dac Signed-off-by: Carter Hsu --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index e61db63..e6af542 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -123,6 +123,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# Audio CCA property +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.audio.cca.enabled=false + # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=3 \ diff --git a/device-shiba.mk b/device-shiba.mk index 1737971..4f4ea74 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -115,6 +115,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# Audio CCA property +PRODUCT_PROPERTY_OVERRIDES += \ + persist.vendor.audio.cca.enabled=false + # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 \ From 407132b1af86658acc82e6de457da3b1ff3d58aa Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 31 Jul 2023 15:27:58 +0800 Subject: [PATCH 21/75] gps: remove unused sensors Bug: 291538679 Test: Verify driving test and VDR engaged rate doesn't impact Change-Id: Id818a6caba7170190da7d5e50f236a8121d2668c --- location/gps.xml | 1 + location/gps.xml.hk3 | 1 + location/gps.xml.sb3 | 1 + location/gps_user.xml | 1 + location/gps_user.xml.hk3 | 1 + location/gps_user.xml.sb3 | 1 + 6 files changed, 6 insertions(+) diff --git a/location/gps.xml b/location/gps.xml index 87364f4..7fd151a 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -62,6 +62,7 @@ ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" MaxThreadNum="13" + SensorsMask="0x244" /> Date: Thu, 3 Aug 2023 19:34:25 +0800 Subject: [PATCH 22/75] audio: new AIDL configuration xml Bug: 206737711 Test: mm Change-Id: Id3eac7b9f3af897cf6163ecc90b6f07960eb0acd --- .../audio_platform_configuration.xml | 118 ++++++++++++++++++ .../audio_platform_configuration_aidl.xml | 76 ----------- audio/husky/audio-tables.mk | 2 +- .../audio_platform_configuration.xml | 118 ++++++++++++++++++ .../audio_platform_configuration_aidl.xml | 76 ----------- audio/shiba/audio-tables.mk | 2 +- 6 files changed, 238 insertions(+), 154 deletions(-) create mode 100644 audio/husky/aidl_config/audio_platform_configuration.xml delete mode 100644 audio/husky/aidl_config/audio_platform_configuration_aidl.xml create mode 100644 audio/shiba/aidl_config/audio_platform_configuration.xml delete mode 100644 audio/shiba/aidl_config/audio_platform_configuration_aidl.xml diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..5700502 --- /dev/null +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + 0.01 + 0.02 + 0.04 + 0.10 + 0.21 + 0.47 + 1.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MIC + CAMCORDER + VOICE_RECOGNITION + + + MIC + CAMCORDER + VOICE_RECOGNITION + + + + + + diff --git a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml b/audio/husky/aidl_config/audio_platform_configuration_aidl.xml deleted file mode 100644 index 64e6593..0000000 --- a/audio/husky/aidl_config/audio_platform_configuration_aidl.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index c177750..8aae616 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -21,7 +21,7 @@ AUDIO_TABLE_FOLDER := husky ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..5700502 --- /dev/null +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + 0.01 + 0.02 + 0.04 + 0.10 + 0.21 + 0.47 + 1.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MIC + CAMCORDER + VOICE_RECOGNITION + + + MIC + CAMCORDER + VOICE_RECOGNITION + + + + + + diff --git a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml b/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml deleted file mode 100644 index 64e6593..0000000 --- a/audio/shiba/aidl_config/audio_platform_configuration_aidl.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index b1d8cbc..9beaa0c 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -21,7 +21,7 @@ AUDIO_TABLE_FOLDER := shiba ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else From d13a2b44ba32be2844ca82826e79da6308ab9933 Mon Sep 17 00:00:00 2001 From: jonerlin Date: Thu, 27 Jul 2023 04:20:48 +0800 Subject: [PATCH 23/75] enable Bluetooth vendor btsnoop in userdebug build as default Bug: 294816359 Test: enable Bluetooth and get bugreport Change-Id: I50a0358654062c264cef6ccbdc89cb7995efb5a2 --- device-husky.mk | 6 ++++-- device-shiba.mk | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index dc8c034..99ecd1f 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -149,12 +149,14 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask=295006 \ persist.bluetooth.bqr.vnd_quality_mask=29 \ - persist.bluetooth.bqr.vnd_trace_mask=0 + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=true else PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask=295006 \ persist.bluetooth.bqr.vnd_quality_mask=16 \ - persist.bluetooth.bqr.vnd_trace_mask=0 + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=false endif # Spatial Audio diff --git a/device-shiba.mk b/device-shiba.mk index 01f2e82..fd87cb6 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -138,12 +138,14 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask=295006 \ persist.bluetooth.bqr.vnd_quality_mask=29 \ - persist.bluetooth.bqr.vnd_trace_mask=0 + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=true else PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask=295006 \ persist.bluetooth.bqr.vnd_quality_mask=16 \ - persist.bluetooth.bqr.vnd_trace_mask=0 + persist.bluetooth.bqr.vnd_trace_mask=0 \ + persist.bluetooth.vendor.btsnoop=false endif # Spatial Audio From 0a99fb90e9cf0ab498239f378f2754d452dfe459 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Mon, 7 Aug 2023 21:00:07 +0000 Subject: [PATCH 24/75] Set PMU_POLL to 0 instead of setting SPC threshold to 100 for CAMERA_ZOOMING_BOOST Bug: 291979193 Test: Device boots okay with new powerhint file Change-Id: I466873b118d12e1d72a237df72fa5d278ee2405d --- perf/powerhint-husky.json | 19 ++----------------- perf/powerhint-ripcurrent.json | 19 ++----------------- perf/powerhint-shiba.json | 19 ++----------------- 3 files changed, 6 insertions(+), 51 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 86438df..265c778 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -654,7 +654,6 @@ "Name": "PMU_LIT_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ - "100", "70", "42", "35", @@ -686,7 +685,6 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "100", "50", "30", "20", @@ -716,7 +714,6 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "100", "50", "22", "20" @@ -1207,21 +1204,9 @@ }, { "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_LIT_SPC_THRESHOLD", + "Node": "PMU_POLL", "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_MID_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_BIG_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" + "Value": "0" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index f745ec0..4118b77 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -637,7 +637,6 @@ "Name": "PMU_LIT_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ - "100", "70", "42", "35", @@ -669,7 +668,6 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "100", "50", "30", "20", @@ -699,7 +697,6 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "100", "50", "22", "20" @@ -1144,21 +1141,9 @@ }, { "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_LIT_SPC_THRESHOLD", + "Node": "PMU_POLL", "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_MID_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_BIG_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" + "Value": "0" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 3d56d8b..4fb526c 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -654,7 +654,6 @@ "Name": "PMU_LIT_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ - "100", "70", "42", "35", @@ -686,7 +685,6 @@ "Name": "PMU_MID_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold", "Values": [ - "100", "50", "30", "20", @@ -716,7 +714,6 @@ "Name": "PMU_BIG_SPC_THRESHOLD", "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold", "Values": [ - "100", "50", "22", "20" @@ -1207,21 +1204,9 @@ }, { "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_LIT_SPC_THRESHOLD", + "Node": "PMU_POLL", "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_MID_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" - }, - { - "PowerHint": "CAMERA_ZOOMING_BOOST", - "Node": "PMU_BIG_SPC_THRESHOLD", - "Duration": 100, - "Value": "100" + "Value": "0" }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", From b8e712bd4cbf383b9cf5de11f762765aa1475fa2 Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 2 Aug 2023 17:21:02 +0000 Subject: [PATCH 25/75] flag_stop_face_auth_on_display_off is true for this device Test: manual Bug: 290077758 Change-Id: I64508ab579319415d2c59629c68f8bc8f44afc40 --- .../packages/SystemUI/res/values/flags.xml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml new file mode 100644 index 0000000..3d4a679 --- /dev/null +++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml @@ -0,0 +1,22 @@ + + + + + true + + From 813a95df594053d222fd7930e86a8bfb3d89c21d Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 1 Aug 2023 07:27:50 +0000 Subject: [PATCH 26/75] refactor gps build system Bug: 290725902 Test: verification test at b/290725902 Change-Id: I931b7f655e0994cab81daa01fd40aaad612b343a --- device-husky.mk | 9 +-------- device-ripcurrent.mk | 9 +-------- device-shiba.mk | 9 +-------- factory_husky.mk | 3 +++ factory_ripcurrent.mk | 3 +++ factory_shiba.mk | 3 +++ 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 5da8623..cfd644b 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -244,14 +244,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts # Location # SDK build system -ifneq ($(BOARD_WITHOUT_RADIO),true) -# Release stable version to factory image -ifneq ($(filter factory_%,$(TARGET_PRODUCT)),) - include device/google/gs-common/gps/brcm/device.mk -else - include device/google/gs-common/gps/brcm/device_v2.mk -endif -endif +include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 77d5c9b..b74d75e 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -204,14 +204,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts # Location # SDK build system -ifneq ($(BOARD_WITHOUT_RADIO),true) -# Release stable version to factory image -ifneq ($(filter factory_%,$(TARGET_PRODUCT)),) - include device/google/gs-common/gps/brcm/device.mk -else - include device/google/gs-common/gps/brcm/device_v2.mk -endif -endif +include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/device-shiba.mk b/device-shiba.mk index 5507c89..3dd3119 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -234,14 +234,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts # Location # SDK build system -ifneq ($(BOARD_WITHOUT_RADIO),true) -# Release stable version to factory image -ifneq ($(filter factory_%,$(TARGET_PRODUCT)),) - include device/google/gs-common/gps/brcm/device.mk -else - include device/google/gs-common/gps/brcm/device_v2.mk -endif -endif +include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer diff --git a/factory_husky.mk b/factory_husky.mk index 54cbdd7..5c2c0ce 100644 --- a/factory_husky.mk +++ b/factory_husky.mk @@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15 $(call inherit-product, device/google/zuma/factory_common.mk) $(call inherit-product, device/google/shusky/device-husky.mk) include device/google/shusky/audio/husky/factory-audio-tables.mk +# Override to factory SDK +$(call soong_config_set, gpssdk, sdkv1, True) +$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT)) PRODUCT_NAME := factory_husky PRODUCT_DEVICE := husky diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk index 37d0f63..b7c64c5 100644 --- a/factory_ripcurrent.mk +++ b/factory_ripcurrent.mk @@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15 $(call inherit-product, device/google/zuma/factory_common.mk) $(call inherit-product, device/google/shusky/device-ripcurrent.mk) include device/google/shusky/audio/ripcurrent/factory-audio-tables.mk +# Override to factory SDK +$(call soong_config_set, gpssdk, sdkv1, True) +$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT)) PRODUCT_NAME := factory_ripcurrent PRODUCT_DEVICE := ripcurrent diff --git a/factory_shiba.mk b/factory_shiba.mk index 365a2f1..d20f113 100644 --- a/factory_shiba.mk +++ b/factory_shiba.mk @@ -19,6 +19,9 @@ TARGET_LINUX_KERNEL_VERSION := 5.15 $(call inherit-product, device/google/zuma/factory_common.mk) $(call inherit-product, device/google/shusky/device-shiba.mk) include device/google/shusky/audio/shiba/factory-audio-tables.mk +# Override to factory SDK +$(call soong_config_set, gpssdk, sdkv1, True) +$(call soong_config_set, gpssdk, gpsmcuversion, gpsv1_$(TARGET_BUILD_VARIANT)) PRODUCT_NAME := factory_shiba PRODUCT_DEVICE := shiba From f70af577b407fe009dd69663434cb92ac4e65f31 Mon Sep 17 00:00:00 2001 From: Jia-yi Chen Date: Thu, 10 Aug 2023 11:30:10 -0700 Subject: [PATCH 27/75] Update CAMERA_SHOT hint 1) Set PMU_POLL to 0 2) Remove direct CPU freq settings but use UClamp Bug: 295186805 Test: Run 3P snapshots and check logcat & perfetto trace Change-Id: Ic8e8f6ab6439b378638a90e9d4238cd22db05e44 --- perf/powerhint-husky.json | 30 ++++++------------------------ perf/powerhint-ripcurrent.json | 30 ++++++------------------------ perf/powerhint-shiba.json | 30 ++++++------------------------ 3 files changed, 18 insertions(+), 72 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 265c778..20e50dc 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -1144,33 +1144,15 @@ }, { "PowerHint": "CAMERA_SHOT", - "Node": "MemFreq", - "Duration": 300, - "Value": "9999999" + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" }, { "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" + "Node": "CAMUClampBoost", + "Duration": 100, + "Value": "765" }, { "PowerHint": "CAMERA_BACKEND_BOOST", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 4118b77..7340cc7 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -1081,33 +1081,15 @@ }, { "PowerHint": "CAMERA_SHOT", - "Node": "MemFreq", - "Duration": 300, - "Value": "9999999" + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" }, { "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" + "Node": "CAMUClampBoost", + "Duration": 100, + "Value": "765" }, { "PowerHint": "CAMERA_BACKEND_BOOST", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 4fb526c..5d1bd1a 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -1144,33 +1144,15 @@ }, { "PowerHint": "CAMERA_SHOT", - "Node": "MemFreq", - "Duration": 300, - "Value": "9999999" + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" }, { "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" + "Node": "CAMUClampBoost", + "Duration": 100, + "Value": "765" }, { "PowerHint": "CAMERA_BACKEND_BOOST", From 31ea730ca1a95ea1285033147e6491c55592c54e Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 15 Aug 2023 14:38:12 +0800 Subject: [PATCH 28/75] audio: support boost mcps for handset swb Bug:294182291 Test: manual test Change-Id: I8d5d7d3326ca5bd26ac9557c1629e17150cb21bb Signed-off-by: Jasmine Cha --- audio/husky/aidl_config/audio_platform_configuration.xml | 1 + audio/shiba/aidl_config/audio_platform_configuration.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index 5700502..9314da8 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -71,6 +71,7 @@ + diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml index 5700502..9314da8 100644 --- a/audio/shiba/aidl_config/audio_platform_configuration.xml +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -71,6 +71,7 @@ + From e66ffc5339f9b9fcac5a8e1ad87b3f11a5f36b44 Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 16 Aug 2023 16:50:06 +0000 Subject: [PATCH 29/75] Update lock icon padding which is also used for UDFPS Test: manual Bug: 295213294 Change-Id: I8daa81975c95a3c6708df1c997599fdd177d7e8c --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 60c4da6..7b628bc 100644 --- a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -23,4 +23,7 @@ 1040px 1174px + + 57px From 46ef8938b750369b920c8a5631334cd2a18c4e7e Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 16 Aug 2023 19:42:46 +0000 Subject: [PATCH 30/75] Update lock icon padding (UDFPS padding) + burnIn offsets Test: manual Bug: 296268743 Fixes: 296268743 Change-Id: I4fea91f5b62859c0a1075a4237ffd2cf487c5668 --- .../base/packages/SystemUI/res/values/dimens.xml | 2 ++ .../base/packages/SystemUI/res/values/dimens.xml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 7b628bc..8cec238 100644 --- a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -26,4 +26,6 @@ 57px + + 19px diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 408d919..0592ba2 100644 --- a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -23,4 +23,11 @@ 1000px 1160px + + 50px + + + 6px + 17px From 77ffcb817c3ea9e6e9276be04782b6610ee368b5 Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Mon, 21 Aug 2023 01:50:46 +0000 Subject: [PATCH 31/75] display: remove blocking zone use display device config file instead of config.xml Bug: 295020354 test: check the dumpsys display Change-Id: Ieb5babcd7e3770585c544b8547c94ce95aef5c1e --- .../frameworks/base/core/res/res/values/config.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index 64c20b4..1fff984 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -48,19 +48,6 @@ 0.087114228 - - - - 2 - - - 5 - - - - 120 - @@ -570,10 +642,18 @@ - + + + + + + + + + @@ -582,10 +662,18 @@ - + + + + + + + + + @@ -598,10 +686,18 @@ - + + + + + + + + + @@ -628,10 +724,18 @@ - + + + + + + + + + @@ -644,10 +748,18 @@ - + + + + + + + + + @@ -700,10 +812,18 @@ - + + + + + + + + + @@ -878,7 +998,7 @@ - + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index de79b5f..f9a1370 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -377,10 +377,18 @@ - + + + + + + + + + @@ -401,10 +409,18 @@ - + + + + + + + + + @@ -425,10 +441,18 @@ - + + + + + + + + + @@ -454,10 +478,18 @@ - + + + + + + + + + @@ -478,14 +510,30 @@ - + - + + + + + + + + + + + + + + + + + @@ -506,10 +554,18 @@ - + + + + + + + + + @@ -530,10 +586,18 @@ - + + + + + + + + + @@ -556,11 +620,19 @@ - + + + + + + + + + @@ -570,10 +642,14 @@ - + + + + + @@ -582,10 +658,14 @@ - + + + + + @@ -598,10 +678,14 @@ - + + + + + @@ -628,10 +712,18 @@ - + + + + + + + + + @@ -644,10 +736,14 @@ - + + + + + @@ -700,10 +796,14 @@ - + + + + + @@ -878,7 +978,7 @@ - + From 10fa322cf5d18f52b6fb8c3866e379d95d878a6f Mon Sep 17 00:00:00 2001 From: Patty Huang Date: Thu, 24 Aug 2023 16:10:27 +0800 Subject: [PATCH 35/75] Apply the workaround for the CIS->SCO handover Set system property persist.bluetooth.leaudio.notify.idle.during.call to true to receive the notification when LeAudio group turned idle Bug: 297312397 Test: Switch LE Audio device to HFP device during phone call, and ensure the HFP device can hear sound and don't have buzzing sound. Change-Id: Id89c9325f5158113dd653d2267167d4d0e59c935 --- device-husky.mk | 5 +++++ device-ripcurrent.mk | 5 +++++ device-shiba.mk | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 052b4bb..478e570 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -196,6 +196,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# Bluetooth LE Audio CIS handover to SCO +# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.notify.idle.during.call=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index b74d75e..0965f4f 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -161,6 +161,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# Bluetooth LE Audio CIS handover to SCO +# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.notify.idle.during.call=true + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service diff --git a/device-shiba.mk b/device-shiba.mk index 185e0f8..1ee3e21 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -187,6 +187,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# Bluetooth LE Audio CIS handover to SCO +# Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.notify.idle.during.call=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true From b68ea8c57662e1a5958c9a9c411b34ecdd08ef79 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 7 Aug 2023 13:01:46 -0700 Subject: [PATCH 36/75] powerhint: add tapered_dvfs_headroom_enabled node Test: Load powerhint on device and boot Bug: 294612493 Change-Id: I823a18d5ee7b072115442a9af19645cce0605d72 --- perf/powerhint-husky.json | 10 ++++++++++ perf/powerhint-ripcurrent.json | 10 ++++++++++ perf/powerhint-shiba.json | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index c14d30a..9d59d12 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -249,6 +249,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index bbfbbf1..305c41b 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -232,6 +232,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 77be402..79d3679 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -239,6 +239,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", From ea96611d826a353aa98e4e358259a976c9286311 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 7 Aug 2023 13:07:41 -0700 Subject: [PATCH 37/75] powerhint: game mode tuning Test: Load powerhint file on device and verify tuned parameters are default. Start Subway Surfers game and verify tuned parameters are expected tuned values. Switch away from game, and quit the game, and verify tuned parameters return to default. Bug: 294612493 Change-Id: Ibc0ba8fb1a9f2714d9509cecaa30c227aa4f8b69 --- perf/powerhint-husky.json | 32 ++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 41 +++++++++++++++++++++++++++++++--- perf/powerhint-shiba.json | 32 ++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 3 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 9d59d12..a01790f 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -150,6 +150,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", + "3000", "2000", "500" ], @@ -195,6 +196,7 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", + "3000", "2000", "500" ], @@ -2281,6 +2283,36 @@ "Duration": 0, "Value": "game" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 305c41b..0558959 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -105,8 +105,9 @@ "Name": "CPULittleClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ + "5000", "2000", - "5000" + "500" ], "ResetOnInit": true }, @@ -142,8 +143,10 @@ "Name": "CPUMidClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ + "20000", + "3000", "2000", - "20000" + "500" ], "ResetOnInit": true }, @@ -179,8 +182,10 @@ "Name": "CPUBigClusterDownRateLimitUs", "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ + "20000", + "3000", "2000", - "20000" + "500" ], "ResetOnInit": true }, @@ -2092,6 +2097,36 @@ "Duration": 0, "Value": "419000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 79d3679..1f47f00 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -146,6 +146,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", + "3000", "2000", "500" ], @@ -185,6 +186,7 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Values": [ "20000", + "3000", "2000", "500" ], @@ -2157,6 +2159,36 @@ "Duration": 0, "Value": "419000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "GAME", "Node": "VIRTUAL-SKIN-CPU-MID", From b1aa8bb0ea5b9e4674f1c9afa6a3d9b8da92fbf2 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Wed, 9 Aug 2023 15:55:09 -0700 Subject: [PATCH 38/75] powerhint: disable prefer_idle in game mode Test: Load powerhint file on device and verify tuned parameters are default. Start Subway Surfers game and verify tuned parameters are expected tuned values. Switch away from game, and quit the game, and verify tuned parameters return to default. Bug: 294612493 Change-Id: I2c518b27fbe7191dd1033dd3f3d8044330ccdf8c --- perf/powerhint-husky.json | 12 ++++++++++++ perf/powerhint-ripcurrent.json | 12 ++++++++++++ perf/powerhint-shiba.json | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index a01790f..72d0696 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2313,6 +2313,18 @@ "Duration": 0, "Value": "3000" }, + { + "PowerHint": "GAME", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 0558959..3a18a65 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2127,6 +2127,18 @@ "Duration": 0, "Value": "3000" }, + { + "PowerHint": "GAME", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 1f47f00..5c12ec6 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2189,6 +2189,18 @@ "Duration": 0, "Value": "3000" }, + { + "PowerHint": "GAME", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "GAME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "GAME", "Node": "VIRTUAL-SKIN-CPU-MID", From c545c3bc081076becd6e1ae5223999a39d66d495 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Fri, 11 Aug 2023 23:51:55 -0700 Subject: [PATCH 39/75] powerhint: mask game mode tuning for app launch also clean up useless TAUClampBoost to reduce overhead Test: Build Bug: 294612493 Change-Id: I6a6082b860c5650bba87d48025da0e1c60f8dae8 Signed-off-by: Wei Wang --- perf/powerhint-husky.json | 119 ++++++++++++++++++++++++--------- perf/powerhint-ripcurrent.json | 119 ++++++++++++++++++++++++--------- perf/powerhint-shiba.json | 119 ++++++++++++++++++++++++--------- 3 files changed, 261 insertions(+), 96 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 72d0696..c0e61ec 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -373,9 +373,10 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/ta_prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -774,12 +775,6 @@ "Duration": 1000, "Value": "10" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -873,6 +868,48 @@ "Type": "DoHint", "Value": "LAUNCH_EXTEND" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -891,6 +928,48 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUDVFSHeadroom", + "Duration": 2000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 2000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 2000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 2000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "TAPreferIdle", + "Duration": 2000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "FGPreferIdle", + "Duration": 2000, + "Value": "1" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2188,36 +2267,12 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "REFRESH_120FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "REFRESH_60FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_IDLE", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 3a18a65..b4c16b3 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -359,9 +359,10 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/ta_prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -797,12 +798,6 @@ "Duration": 1000, "Value": "10" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -896,6 +891,48 @@ "Type": "DoHint", "Value": "LAUNCH_EXTEND" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -914,6 +951,48 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUDVFSHeadroom", + "Duration": 2000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 2000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 2000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 2000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "TAPreferIdle", + "Duration": 2000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "FGPreferIdle", + "Duration": 2000, + "Value": "1" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2032,36 +2111,12 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "REFRESH_120FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "REFRESH_60FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_IDLE", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 5c12ec6..cd25a2e 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -363,9 +363,10 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/ta_prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -764,12 +765,6 @@ "Duration": 1000, "Value": "10" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -863,6 +858,48 @@ "Type": "DoHint", "Value": "LAUNCH_EXTEND" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -881,6 +918,48 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUDVFSHeadroom", + "Duration": 2000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 2000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 2000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 2000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "TAPreferIdle", + "Duration": 2000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "FGPreferIdle", + "Duration": 2000, + "Value": "1" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2076,36 +2155,12 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "REFRESH_120FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "REFRESH_60FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", "Duration": 0, "Value": "0" }, - { - "PowerHint": "DISPLAY_IDLE", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", From 9fe8fb10b45cc0d2a461a8664d30a8f9d309808f Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Thu, 10 Aug 2023 21:18:09 +0800 Subject: [PATCH 40/75] [AIDL] Add mixer paths for BT Bug: 293221641 Test: manual Change-Id: I6813b966a65fe9787be911037689e7a2a9d831ed Signed-off-by: Yung Ti Su --- audio/husky/aidl_config/mixer_paths_aidl.xml | 222 ++++++++++++++++- audio/shiba/aidl_config/mixer_paths_aidl.xml | 242 ++++++++++++++++++- 2 files changed, 454 insertions(+), 10 deletions(-) diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 15db3c7..9cb0f97 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -377,6 +377,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -409,6 +437,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -441,6 +497,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -478,6 +562,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -510,6 +622,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -554,6 +694,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -586,6 +754,22 @@ + + + + + + + + + + + + + + + + @@ -620,6 +804,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -674,7 +886,7 @@ - + @@ -698,7 +910,7 @@ - + @@ -760,7 +972,7 @@ - + @@ -824,7 +1036,7 @@ - + @@ -988,7 +1200,7 @@ - + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index f9a1370..9cb0f97 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -377,6 +377,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -409,6 +437,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -441,6 +497,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -478,6 +562,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -510,6 +622,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -554,6 +694,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -586,6 +754,22 @@ + + + + + + + + + + + + + + + + @@ -620,6 +804,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -650,6 +862,10 @@ + + + + @@ -666,7 +882,11 @@ - + + + + + @@ -686,7 +906,11 @@ - + + + + + @@ -744,7 +968,11 @@ - + + + + + @@ -804,7 +1032,11 @@ - + + + + + @@ -968,7 +1200,7 @@ - + From dc91348e89cf8b68e27c8610c5e87aad686bbdea Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Tue, 29 Aug 2023 15:20:01 +0800 Subject: [PATCH 41/75] gps: set high accuracy shape mode Bug: 277337710 Test: verify pass in b/277336756#comment32 Change-Id: I662d53739ef29a07c6816247a4a699ae6d3b92d2 --- location/gps.xml | 1 + location/gps.xml.hk3 | 1 + location/gps.xml.sb3 | 1 + location/gps_user.xml | 1 + location/gps_user.xml.hk3 | 1 + location/gps_user.xml.sb3 | 1 + 6 files changed, 6 insertions(+) diff --git a/location/gps.xml b/location/gps.xml index 7fd151a..7a6ce2c 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -58,6 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="2" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index 61e3625..8ad70f0 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -58,6 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="2" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index c1fe15b..1c42ca0 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -58,6 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="2" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 86fa5e3..9d42ff3 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -57,6 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="2" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 27d43ef..94f5955 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -57,6 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="2" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index 62af598..f19e50f 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -57,6 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="2" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" From 389a9bc4d14faf51737d900f6288768475554a2b Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Thu, 31 Aug 2023 14:08:34 +0800 Subject: [PATCH 42/75] audio: add runtime tuning dump for bluenote Bug: 298314391 Test: manual test Change-Id: I81e8c64c1dfb9e2b34bb05689e5cf83467708d91 Signed-off-by: Jasmine Cha --- audio/husky/aidl_config/audio_platform_configuration.xml | 1 + audio/shiba/aidl_config/audio_platform_configuration.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index 9314da8..8707d44 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -30,6 +30,7 @@ + diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml index 9314da8..8707d44 100644 --- a/audio/shiba/aidl_config/audio_platform_configuration.xml +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -30,6 +30,7 @@ + From f9c8cd244b60bdceed6510c8107284196b2a2be6 Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Thu, 31 Aug 2023 10:22:13 +0000 Subject: [PATCH 43/75] add mixer path for BT SCO voice call Bug: 297794937 Test: manual Change-Id: Ied5cd99dbab9a29a8abe2b7fd35c2e19dc35aba0 Signed-off-by: Yung Ti Su --- audio/husky/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++ audio/shiba/aidl_config/mixer_paths_aidl.xml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 9cb0f97..4ca5e58 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -936,6 +936,18 @@ + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 9cb0f97..4ca5e58 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -936,6 +936,18 @@ + + + + + + + + + + + + From dd4fbc21954adc28905e1d9d6ad61bd724991c34 Mon Sep 17 00:00:00 2001 From: gilliu Date: Wed, 19 Jul 2023 16:16:58 +0800 Subject: [PATCH 44/75] Display: Disable display acl function Bug: 289265201 Test: self ZA testing Change-Id: I196a4addac4cfe5ecad6ed86a15c7038296c8f93 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index e61db63..0972bfd 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -305,7 +305,7 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.primarydisplay.min_idle_refresh_rate.blocking_zone_dbv=492 # Display ACL -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.acl.default=1 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.acl.default=0 # display color data PRODUCT_COPY_FILES += \ From 270debe4aa16b47336edc53940c9628fef0e18a0 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Tue, 15 Aug 2023 09:57:47 +0800 Subject: [PATCH 45/75] audio: using Fortemedia mcps table Bug: 295415355 Test: Verified at b/295415355#comment4 Change-Id: Ia5027a73af93db3f77acb96d236b828760dc2d3d Signed-off-by: Carter Hsu --- .../config/audio_platform_configuration.xml | 2 +- audio/husky/tuning/fortemedia/mcps.dat | Bin 292 -> 1692 bytes audio/ripcurrent/tuning/fortemedia/mcps.dat | Bin 292 -> 1692 bytes .../config/audio_platform_configuration.xml | 2 +- audio/shiba/tuning/fortemedia/mcps.dat | Bin 292 -> 1692 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 1d3689a..86e910b 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -307,7 +307,7 @@ - + diff --git a/audio/husky/tuning/fortemedia/mcps.dat b/audio/husky/tuning/fortemedia/mcps.dat index 1c1631473eeb21412a0dfb8bf6f005254022636f..7f3aeaadbce39fcd2273f6eb42578e4b8fef94b5 100644 GIT binary patch literal 1692 zcmY+?Ic|es5P(qw7conj$|nE=zpGS{(uUP6=9D>EET!R5F+xwDMojqr`Kms{`$^*P z|9%U%%jF|FO%YT4d;XT3rwA9}B3y)vaWO8&#kd5Q;1XPdyW+0Vd50_Ric4`RF2$v| z442_DT!zbWIWEWLxB^$;3S5CJaV4(AmADF5@gJ)Ad_7fip6<9i?vA_TYFv%0aW$^N zHMj=X;96XZYjG_u-~uk-0`7r(;2yXKuETY>4%gv&T#xH`yD?Du591-H;!=q>bC+)8hyx6<2i8@-L*MsLUMxE;6S TUbq+Tg?r%++<`lA$J_k@-n5+G literal 292 zcmY+HTs0$VRe>FGQ7 hVmLB(;TTTg6!)ZlUGC*@4(D(VHvs&<9gI?xffviYKEET!R5F+xwDMojqr`Kms{`$^*P z|9%U%%jF|FO%YT4d;XT3rwA9}B3y)vaWO8&#kd5Q;1XPdyW+0Vd50_Ric4`RF2$v| z442_DT!zbWIWEWLxB^$;3S5CJaV4(AmADF5@gJ)Ad_7fip6<9i?vA_TYFv%0aW$^N zHMj=X;96XZYjG_u-~uk-0`7r(;2yXKuETY>4%gv&T#xH`yD?Du591-H;!=q>bC+)8hyx6<2i8@-L*MsLUMxE;6S TUbq+Tg?r%++<`lA$J_k@-n5+G literal 292 zcmY+{j{f~n};4u>Ch2$bG g>&Q@r - + diff --git a/audio/shiba/tuning/fortemedia/mcps.dat b/audio/shiba/tuning/fortemedia/mcps.dat index 1c1631473eeb21412a0dfb8bf6f005254022636f..7f3aeaadbce39fcd2273f6eb42578e4b8fef94b5 100644 GIT binary patch literal 1692 zcmY+?Ic|es5P(qw7conj$|nE=zpGS{(uUP6=9D>EET!R5F+xwDMojqr`Kms{`$^*P z|9%U%%jF|FO%YT4d;XT3rwA9}B3y)vaWO8&#kd5Q;1XPdyW+0Vd50_Ric4`RF2$v| z442_DT!zbWIWEWLxB^$;3S5CJaV4(AmADF5@gJ)Ad_7fip6<9i?vA_TYFv%0aW$^N zHMj=X;96XZYjG_u-~uk-0`7r(;2yXKuETY>4%gv&T#xH`yD?Du591-H;!=q>bC+)8hyx6<2i8@-L*MsLUMxE;6S TUbq+Tg?r%++<`lA$J_k@-n5+G literal 292 zcmY+HTs0$VRe>FGQ7 hVmLB(;TTTg6!)ZlUGC*@4(D(VHvs&<9gI?xffviYK Date: Tue, 15 Aug 2023 11:28:41 +0800 Subject: [PATCH 46/75] set the HW stage with old bluetooth chip that BT fimrware does not longer support it Bug: 290618957 Test: fake fw crash in Proto 1.1 device and check the log Change-Id: I6eb6bfe430eb68010b16c6c0af5ccd5c438fc5c6 --- bluetooth/bt_vendor_overlay.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index dc30336..765e60f 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -10,6 +10,10 @@ AocPowerPinCtrlCheckEnable = true # This only affects when AocPowerPinCtrlCheckEnable is true HwStageDoesNotCtrlPowerPinFromAoc = PROTO1.0-EVT1.0-EVT1.2 +# The hardware stage with old chip revision is no longer +# supported by BT firmware. +HwStageWithOldChipFwNoLongerSupport = PROTO1.0-PROTO1.1 + # Sar backOff high resolution support SarBackOffHighResolution = true From df004390871d30df25c6e2b026c69d90436a4a1e Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Mon, 28 Aug 2023 13:09:54 -0700 Subject: [PATCH 47/75] Allow more CPU resources when launch camera Bug: 297367915 Test: Confirm user_vote_bypass can be applied during camera launch when SKIN severity is lower than CRITICAL Change-Id: I1134f577bd4101572d8cbe291322a1a4b035cfde --- perf/powerhint-husky.json | 42 ++++++++++++++++++++++++++++++++++++--- perf/powerhint-shiba.json | 42 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 6 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 0f55f64..4551cde 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -1023,6 +1023,24 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1095,6 +1113,24 @@ "Duration": 1000, "Value": "1" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 2000, + "Value": "1" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 2000, + "Value": "1" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 2000, + "Value": "1" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -2435,19 +2471,19 @@ "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index d32554c..c05756f 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -1013,6 +1013,24 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", @@ -1085,6 +1103,24 @@ "Duration": 1000, "Value": "1" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 2000, + "Value": "1" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 2000, + "Value": "1" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 2000, + "Value": "1" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -2323,19 +2359,19 @@ "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" From 99233e5ab0fce162fc15bd44b8e94bb372319b88 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 25 Aug 2023 16:25:20 -0700 Subject: [PATCH 48/75] allow wlc charge thermal target to 41 degC Bug: 290828382 Test: emul_temp beteween 25 and 43 degC and monitor the log Change-Id: I831dd46e8ff9602073073edcfc03e8c0104518ae --- thermal/thermal_info_config_charge_husky.json | 70 ++++++++++++++++++- thermal/thermal_info_config_charge_shiba.json | 70 ++++++++++++++++++- thermal/thermal_info_config_husky.json | 70 ++++++++++++++++++- thermal/thermal_info_config_shiba.json | 70 ++++++++++++++++++- 4 files changed, 276 insertions(+), 4 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 59fa1f8..dd6af4a 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -129,15 +129,40 @@ "Offset":1140, "Multiplier":0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"4.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], + "Coefficient":[1.0, -1000000], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, @@ -172,6 +197,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1302 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name":"USB-MINUS-NEUTRAL", "Type":"UNKNOWN", diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index f73e8f2..9d5dc07 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -162,15 +162,40 @@ "Offset":-5080, "Multiplier":0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"4.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", "VIRTUAL-SKIN-CHARGE-SUB-6"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], + "Coefficient":[1.0, -1000000], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, @@ -205,6 +230,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1099 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name":"USB-MINUS-NEUTRAL", "Type":"UNKNOWN", diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 86e317e..4703935 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -750,15 +750,40 @@ "Offset":1140, "Multiplier":0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"4.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], + "Coefficient":[1.0, -1000000], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, @@ -793,6 +818,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1302 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name":"VIRTUAL-SKIN-FRONT-SUB-0", "Type":"UNKNOWN", diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 2e37654..4d24a0b 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -762,15 +762,40 @@ "Offset":-5080, "Multiplier":0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"4.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", "VIRTUAL-SKIN-CHARGE-SUB-6"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], + "Coefficient":[1.0, -1000000], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, @@ -805,6 +830,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1099 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name":"VIRTUAL-SKIN-FRONT-SUB-0", "Type":"UNKNOWN", From 544a00a41c309fe13ef402e940a7b9ffeec47a48 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Sun, 20 Aug 2023 18:08:31 +0000 Subject: [PATCH 49/75] Enable UVC support on shuksy Shiba and husky now support the UVC gadget function. Setting this flag triggers the framework to surface the UVC specific functionality and UI. Bug: 287675279 Test: Use webcam on shusky Merged-In: I3e5d3b64f8d21cac77e519f335e046231ad4fbb1 Change-Id: I3e5d3b64f8d21cac77e519f335e046231ad4fbb1 Signed-off-by: Jayant Chowdhary --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 2587d53..eff8e91 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -397,3 +397,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Enable camera exif model/make reporting PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true + +# Enable DeviceAsWebcam support +PRODUCT_VENDOR_PROPERTIES += \ + ro.usb.uvc.enabled=true diff --git a/device-shiba.mk b/device-shiba.mk index 6a97833..4753538 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -372,3 +372,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Enable camera exif model/make reporting PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true + +# Enable DeviceAsWebcam support +PRODUCT_VENDOR_PROPERTIES += \ + ro.usb.uvc.enabled=true From 60b9ce093229eeff03149c48423fcc188cc758e4 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Sun, 10 Sep 2023 11:18:10 +0000 Subject: [PATCH 50/75] [USB Audio AIDL] Fix wrong capture path on mixer_paths.xml Bug: 299388175 Test: Local Test Change-Id: I856e1ad4dc9677b3e06f7c46c7e88b4c5681eed9 --- audio/husky/aidl_config/mixer_paths_aidl.xml | 2 +- audio/shiba/aidl_config/mixer_paths_aidl.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 4ca5e58..48016b4 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -859,7 +859,7 @@ - + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 4ca5e58..48016b4 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -859,7 +859,7 @@ - + From 21985dbb777c8e6fea485c3a079b23c64ed20edc Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Mon, 11 Sep 2023 01:49:20 +0000 Subject: [PATCH 51/75] shusky: Disable task packing Disable task packing by default, but keep game mode on since it may cause perf regression if disabled. Bug: 295991841 Test: build pass (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b416077f48c36bba953502679d610c7bccf4ea8b) Merged-In: Ie1116f2b253c7f5ce0ad309474ef7750a9fc5bb2 Change-Id: Ie1116f2b253c7f5ce0ad309474ef7750a9fc5bb2 --- perf/powerhint-husky.json | 64 +++++----------------------------- perf/powerhint-ripcurrent.json | 64 +++++----------------------------- perf/powerhint-shiba.json | 64 +++++----------------------------- 3 files changed, 24 insertions(+), 168 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 4551cde..dc514f4 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -402,8 +402,8 @@ "Name": "NPITaskPacking", "Path": "/proc/vendor_sched/npi_packing", "Values": [ - "0", - "1" + "1", + "0" ], "ResetOnInit": true }, @@ -828,12 +828,6 @@ "Duration": 5000, "Value": "1401000" }, - { - "PowerHint": "LAUNCH", - "Node": "NPITaskPacking", - "Duration": 5000, - "Value": "0" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -1095,12 +1089,6 @@ "Duration": 1000, "Value": "4-8" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "NPITaskPacking", - "Duration": 1000, - "Value": "0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "PMU_POLL", @@ -1149,12 +1137,6 @@ "Duration": 2000, "Value": "9999999" }, - { - "PowerHint": "CAMERA_LAUNCH_EXTENDED", - "Node": "NPITaskPacking", - "Duration": 2000, - "Value": "0" - }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "PMU_POLL", @@ -1557,12 +1539,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1713,12 +1689,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1845,12 +1815,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1929,12 +1893,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2073,12 +2031,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2392,6 +2344,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "NPITaskPacking", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", @@ -2704,12 +2662,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_PROJECT11", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 4340f3e..96b400c 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -388,8 +388,8 @@ "Name": "NPITaskPacking", "Path": "/proc/vendor_sched/npi_packing", "Values": [ - "0", - "1" + "1", + "0" ], "ResetOnInit": true }, @@ -851,12 +851,6 @@ "Duration": 5000, "Value": "1401000" }, - { - "PowerHint": "LAUNCH", - "Node": "NPITaskPacking", - "Duration": 5000, - "Value": "0" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -1077,12 +1071,6 @@ "Duration": 1000, "Value": "4-8" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "NPITaskPacking", - "Duration": 1000, - "Value": "0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "PMU_POLL", @@ -1113,12 +1101,6 @@ "Duration": 2000, "Value": "9999999" }, - { - "PowerHint": "CAMERA_LAUNCH_EXTENDED", - "Node": "NPITaskPacking", - "Duration": 2000, - "Value": "0" - }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "PMU_POLL", @@ -1419,12 +1401,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1569,12 +1545,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1695,12 +1665,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1773,12 +1737,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -1917,12 +1875,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2170,6 +2122,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "NPITaskPacking", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", @@ -2512,12 +2470,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_PROJECT11", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index c05756f..6638a8f 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -392,8 +392,8 @@ "Name": "NPITaskPacking", "Path": "/proc/vendor_sched/npi_packing", "Values": [ - "0", - "1" + "1", + "0" ], "ResetOnInit": true }, @@ -818,12 +818,6 @@ "Duration": 5000, "Value": "1401000" }, - { - "PowerHint": "LAUNCH", - "Node": "NPITaskPacking", - "Duration": 5000, - "Value": "0" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -1085,12 +1079,6 @@ "Duration": 1000, "Value": "4-8" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "NPITaskPacking", - "Duration": 1000, - "Value": "0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "PMU_POLL", @@ -1139,12 +1127,6 @@ "Duration": 2000, "Value": "9999999" }, - { - "PowerHint": "CAMERA_LAUNCH_EXTENDED", - "Node": "NPITaskPacking", - "Duration": 2000, - "Value": "0" - }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "PMU_POLL", @@ -1445,12 +1427,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1601,12 +1577,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1733,12 +1703,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1817,12 +1781,6 @@ "Duration": 0, "Value": "4-8" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -1961,12 +1919,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", @@ -2280,6 +2232,12 @@ "Duration": 0, "Value": "game" }, + { + "PowerHint": "GAME", + "Node": "NPITaskPacking", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", @@ -2592,12 +2550,6 @@ "Duration": 0, "Value": "0-8" }, - { - "PowerHint": "CAMERA_PROJECT11", - "Node": "NPITaskPacking", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MIFTargetLoad", From 1ad597d091ae4ac20372ca8a0c486102a943f18e Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Wed, 13 Sep 2023 14:41:47 +0800 Subject: [PATCH 52/75] Jump SVN to 4 Test: adb shell getprop ro.vendor.build.svn Bug: 300185894 Change-Id: I7f0e4e433dbb1c65984971f17805798f54c6170a --- device-husky.mk | 2 +- device-shiba.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index bdf00ff..5ba5f07 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -321,7 +321,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=4 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-shiba.mk b/device-shiba.mk index 116b14e..01a9d1e 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -302,7 +302,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=4 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From acbd4d094ec07e81dc5edc32205e96ddbef2533e Mon Sep 17 00:00:00 2001 From: Zheng Pan Date: Thu, 14 Sep 2023 00:41:29 +0000 Subject: [PATCH 53/75] Revert "Adjust height ratio for keyboard" This reverts commit b679d1c13e689b8ff63b660468f891e2aca5c540. Reason for revert: b/292657351 Change-Id: Ic6561a65adf33afd69342ce1401ee71a32a2fbe3 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index bdf00ff..1869e21 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -365,7 +365,7 @@ PRODUCT_SYSTEM_PROPERTIES += \ # Keyboard height ratio and bottom padding in dp for portrait mode PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=10.4 \ - ro.com.google.ime.height_ratio=1.2 + ro.com.google.ime.height_ratio=1.0 # Enable camera exif model/make reporting PRODUCT_VENDOR_PROPERTIES += \ From d79c602a264f8daf4d0256d834c172f1b26f9a2a Mon Sep 17 00:00:00 2001 From: Sergey Volk Date: Wed, 13 Sep 2023 21:54:50 +0000 Subject: [PATCH 54/75] DO NOT MERGE displayport: Move displayport configuration to device. Move displayport configuration to device level makefile. Test: manual (check /sys/module/exynos_drm/parameters/dp_enabled) Bug: 300167292 Change-Id: I04be078cc71d54ef0f943578fdefee33cb18332e --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index bb663fc..5afab7d 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -401,3 +401,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# DisplayPort should be disabled by default (b/300167292) +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.usb.displayport.enabled=0 diff --git a/device-shiba.mk b/device-shiba.mk index 4753538..1662997 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,3 +376,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# DisplayPort should be disabled by default (b/300167292) +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.usb.displayport.enabled=0 From 01e067a7ab96e6069302e315305465093a5765cd Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Fri, 15 Sep 2023 00:09:09 +0000 Subject: [PATCH 55/75] audio: FM table check for UDC QPR1 #HK3/SB3 (Ricky/Duncan) 1. Modify kid's voice parameter for all band all usercases DR_RESRV_7: 0x122E DR_RESRV_8: 0x1100 Bug: 300422978 Test: verified by acoustic team Change-Id: Ifb331a8d16b5bd76ead68141cc6f74c4d0458d8f Signed-off-by: Carter Hsu --- audio/husky/tuning/fortemedia/BLUETOOTH.dat | Bin 279682 -> 279682 bytes audio/husky/tuning/fortemedia/BLUETOOTH.mods | 106 +- audio/husky/tuning/fortemedia/HANDSET.dat | Bin 258170 -> 258170 bytes audio/husky/tuning/fortemedia/HANDSET.mods | 98 +- audio/husky/tuning/fortemedia/HANDSFREE.dat | Bin 118342 -> 118342 bytes audio/husky/tuning/fortemedia/HANDSFREE.mods | 46 +- audio/husky/tuning/fortemedia/HEADSET.dat | Bin 430266 -> 430266 bytes audio/husky/tuning/fortemedia/HEADSET.mods | 162 +- audio/shiba/tuning/fortemedia/BLUETOOTH.dat | Bin 279682 -> 279682 bytes audio/shiba/tuning/fortemedia/BLUETOOTH.mods | 37834 ++++++++--------- audio/shiba/tuning/fortemedia/HANDSET.dat | Bin 258170 -> 258170 bytes audio/shiba/tuning/fortemedia/HANDSET.mods | 98 +- audio/shiba/tuning/fortemedia/HANDSFREE.dat | Bin 118342 -> 118342 bytes audio/shiba/tuning/fortemedia/HANDSFREE.mods | 46 +- audio/shiba/tuning/fortemedia/HEADSET.dat | Bin 430266 -> 430266 bytes audio/shiba/tuning/fortemedia/HEADSET.mods | 162 +- 16 files changed, 19276 insertions(+), 19276 deletions(-) diff --git a/audio/husky/tuning/fortemedia/BLUETOOTH.dat b/audio/husky/tuning/fortemedia/BLUETOOTH.dat index d9c8095ca875b291dd9d4346687b96df1da7dd46..b70e534a2d286c080170d245a60d2ac55afbc89e 100644 GIT binary patch delta 525 zcmZqb6m04g+>pn?rYFS5#2`4ip>5V?KF$_~OpiLpC^EgSjEQG^-vTBDnC|UBJ2ok92daP@ zxP5{iBizL87tS$@v2I@#%lJYC>MW2v&``f~Ktr?2m_(-M0a@GUc`zdk1zWovr~+Xq z&>n=L2ott<9bzZ}XSNjwjEGoMi>nVyt-q|JllbRhcFsqB}jZa&`Oc*RX#{Y eL);6LL>LP66~a)U4L~opNwFa0Zz!>>QUm~0(vW@t delta 525 zcmZqb6m04g+>pn?#=yYG#K17Qp>5V?KF$_~OpiLpC^EgSjEQG^-vTBDnC|UBJ2ok92daP@ zxP5{iBizL87tS$@v2I@#%lJYC>MW2v&``f~Ktr?2m_(-M0a@GUc`zdk1zWovr~+Xq z&>n=L2ott<9bzZ}XSNjwjEGoMi>nVyt-q|JllbRhcFsqB}jZa&`Oc*RX#{Y eL);6LL>LP66~a)U4L~opNwFa0Zz!>>QUn0N#fU@z diff --git a/audio/husky/tuning/fortemedia/BLUETOOTH.mods b/audio/husky/tuning/fortemedia/BLUETOOTH.mods index 7cc39ec..f93e51a 100644 --- a/audio/husky/tuning/fortemedia/BLUETOOTH.mods +++ b/audio/husky/tuning/fortemedia/BLUETOOTH.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG BLUETOOTH #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2023-07-06 16:40:03 +#SAVE_TIME 2023-09-14 20:13:28 #CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -535,8 +535,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -3230,8 +3230,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -5925,8 +5925,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0064 //TX_DR_RESRV_5 525 0x1000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -8620,8 +8620,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -11315,8 +11315,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0064 //TX_DR_RESRV_5 525 0x1000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -14010,8 +14010,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -16705,8 +16705,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -19400,8 +19400,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -22095,8 +22095,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -24790,8 +24790,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -27485,8 +27485,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -30180,8 +30180,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -32875,8 +32875,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -35570,8 +35570,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -38265,8 +38265,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -40960,8 +40960,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -43655,8 +43655,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -46350,8 +46350,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -49045,8 +49045,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -51740,8 +51740,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -54435,8 +54435,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -57130,8 +57130,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -59825,8 +59825,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -62520,8 +62520,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -65215,8 +65215,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -67910,8 +67910,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x0000 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0028 //TX_SNR_THR diff --git a/audio/husky/tuning/fortemedia/HANDSET.dat b/audio/husky/tuning/fortemedia/HANDSET.dat index 3e3a68fdd39daf7da06d12c70a611439f113ce83..77623983875399c0d66c75a309f5b2a3607c526b 100644 GIT binary patch delta 495 zcmezMfdAJ6{tbB?Y1-jn;Y8xX~NV1&2nPjd~Ew3B{Z{Eux&o|5H7kMXqFTE_H*2f za3P>En-#Y^2Qb171}TDAh;YM#YmA!}r~98{qcBYk#QpYm@Dq$u{Lgj$Igv)^f1Za3(5i@qf3#GQ#A7e)N2do?b DqAHaV delta 495 zcmezMfdAJ6{tbB?Yzz#1ObiU$H`FmTv2FgwSECFSncUDeYrEe{rVT8c51DUKfvLN2 zj@gTK`@LAkOqtF4b>1-jn;Y8xX~NV1&2nPjd~Ew3B{Z{Eux&o|5H7kMXqFTE_H*2f za3P>En-#Y^2Qb171}TDAh;YM#YmA!}r~98{qcBYk#QpYm@Dq$u{Lgj$Igv)^f1Za3(5i@qf3#GQ#A7e)N2do?b D85@my diff --git a/audio/husky/tuning/fortemedia/HANDSET.mods b/audio/husky/tuning/fortemedia/HANDSET.mods index 0920c0a..b7fb237 100644 --- a/audio/husky/tuning/fortemedia/HANDSET.mods +++ b/audio/husky/tuning/fortemedia/HANDSET.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSET #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2023-08-28 11:13:37 +#SAVE_TIME 2023-09-14 20:10:18 #CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -535,8 +535,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -3230,8 +3230,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -5925,8 +5925,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -8620,8 +8620,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -11315,8 +11315,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -14010,8 +14010,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -16705,8 +16705,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -19400,8 +19400,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -22095,8 +22095,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -24790,8 +24790,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -27485,8 +27485,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -30180,8 +30180,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -32875,8 +32875,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -35570,8 +35570,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -38265,8 +38265,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -40960,8 +40960,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -43655,8 +43655,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -46350,8 +46350,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -49045,8 +49045,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -51740,8 +51740,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -54435,8 +54435,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -57130,8 +57130,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -59825,8 +59825,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -62520,8 +62520,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR diff --git a/audio/husky/tuning/fortemedia/HANDSFREE.dat b/audio/husky/tuning/fortemedia/HANDSFREE.dat index 329b4bcb3e1c649493c3e97ee322303c36c5a7a1..72a9f6cd3af3dc179ee9d7e6799224b660686ccd 100644 GIT binary patch delta 211 zcmX>$hyBO)Y8>VS$hyBO)Yzz#1ObiT@8`@@V=HpD!MCJ<_BlDMS*4oIcxLLo>8>VS2-aN#df+&RG!9t)? z2)KuqL_u08ZJKr=16rztptsOdp%?KF5NSa?h%C;Uym_JYxU)0A@B3!n?sj;0J6y{I z&DdZ+@44;N^1R{>-Fi8u3R}Ne#l1I4g;HU??%H2po9_O?UbNHY7S=sA(P?<9z5$Vs z190rJY}lC|WtN+`ijyAV%P=n4Jhi`xF=7FJn9Qk8@MYI~)s)}~kqtv)g(VdM4o1bd zh?8nD3ubnhCZlW_?9W|f)Y9aWoPn+`e{*!@4?D#}VL>L!A1N{hX~5zHpCW7RnX@_m zT?O~U5z|p&c1*bV($$11(Bg|6w@P;Y4iwM%LnZRRgqn`ohz@^-r5yk-Et;f`B@EHK zCiKY9miQoH)f4X+ggyy65#SHaqOSCaI<(psnvY!>xRs5JVZm%muM{vJ$_+m^v>dL4 zsA^#a6YLdgu}>)gO|i>qi=Ob0Y^I+yiL*m2o=lz>@hS0MDYPUf92HFO@X47WRLPTmv=0@-F}Y delta 830 zcmZva&nrYx6vyY@`|cY*UMQj_iAlYB)J#@St+K*&B@I+a#Al9N`(WO5&xcRKKV5Eo##0kN4ISzm5ZM}pdzX!coaQQKx$Pe< zq=)z<)JQf&?Tht{Sb!fUb5gZ@!u4h^C3r%Ng`jpu+K%0kqzpf96W3YZV&%DN3LhbtkfT3Fl!ds5<^mePj4 z6L#VflEu=3%}0ao^c^da%Fps;H5j82*!Pa1mLrnv`X%&&I(mepn?rYFS5#2`4ip>5V?KF$hysN zP0(Y68@~O*Ic71|?Wpn?#=yYG#K17Qp>5V?KF$hysN zP0(Y68@~O*Ic71|?W&f!dz27?pn_#x#7U3`7;s<8W2T_HZ>JOa(>; T#GXQ_?e)i)5xxYvYn37Zt+$xe delta 499 zcmezMfdAJ6{tbB?Yzz#1ObiU$H`FmTu}uD#Fk^Ec?-LcM=;VgBd7H(I6EtC}E}Ua- zV%hvJp+*%dvbmw{A53;S(2QN1?KZl=1i;$WZo{=t2WmgIJ&2Xj0;Xd71U*K${_QZ+ zeHgbV#W5PdT(Nz@HO9?~)BVpea&PZC#=M4QJJU+WDa`0@GL+p8RN@Wy5l|PV(LhDv zN=zt<%(%DTGi5p&f!dz27?pn_#x#7U3`7;s<8W2T_HZ>JOa(>; T#GXQ_?e)i)5xxYvYn37Zy&{o3 diff --git a/audio/shiba/tuning/fortemedia/HANDSET.mods b/audio/shiba/tuning/fortemedia/HANDSET.mods index c62a0a1..161c088 100644 --- a/audio/shiba/tuning/fortemedia/HANDSET.mods +++ b/audio/shiba/tuning/fortemedia/HANDSET.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSET #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2023-08-28 14:39:36 +#SAVE_TIME 2023-09-13 17:44:33 #CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -535,8 +535,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -3230,8 +3230,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -5925,8 +5925,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -8620,8 +8620,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -11315,8 +11315,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -14010,8 +14010,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -16705,8 +16705,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -19400,8 +19400,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -22095,8 +22095,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -24790,8 +24790,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -27485,8 +27485,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -30180,8 +30180,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -32875,8 +32875,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -35570,8 +35570,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -38265,8 +38265,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -40960,8 +40960,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -43655,8 +43655,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -46350,8 +46350,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -49045,8 +49045,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -51740,8 +51740,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -54435,8 +54435,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -57130,8 +57130,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -59825,8 +59825,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -62520,8 +62520,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR diff --git a/audio/shiba/tuning/fortemedia/HANDSFREE.dat b/audio/shiba/tuning/fortemedia/HANDSFREE.dat index 6e997180861873c1dac3ff068f4c47d705932e22..118015676dbf4a580d1d4ff2ee6f67aa743e0a0e 100644 GIT binary patch delta 205 zcmX>$hyBO)YE zg5*RMH=AGbh8ehhf*#{$#p(8HjNF^u{y4yd;cB-7Wl$7j8n@lO3ZVpOVIAXku@=S# P4TKZtZMRy>$fF1VfsQul delta 205 zcmX>$hyBO)Yzz#1ObiT@8`@@V=HpD!MDXWt7B`MZ;?LVG6`KI#Z*FM&2V(>E zg5*RMH=AGbh8ehhf*#{$#p(8HjNF^u{y4yd;cB-7Wl$7j8n@lO3ZVpOVIAXku@=S# P4TKZtZMRy>$fF1V3XL;u diff --git a/audio/shiba/tuning/fortemedia/HANDSFREE.mods b/audio/shiba/tuning/fortemedia/HANDSFREE.mods index 07ddb03..2b2a1e7 100644 --- a/audio/shiba/tuning/fortemedia/HANDSFREE.mods +++ b/audio/shiba/tuning/fortemedia/HANDSFREE.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSFREE #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2023-07-06 22:17:23 +#SAVE_TIME 2023-09-13 17:44:57 #CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -535,8 +535,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -3230,8 +3230,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -5925,8 +5925,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0064 //TX_DR_RESRV_5 525 0x1000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -8620,8 +8620,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -11315,8 +11315,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0064 //TX_DR_RESRV_5 525 0x1000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -14010,8 +14010,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -16705,8 +16705,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0064 //TX_DR_RESRV_5 525 0x1000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -19400,8 +19400,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -22095,8 +22095,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0064 //TX_DR_RESRV_5 525 0x1000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -24790,8 +24790,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0000 //TX_DR_RESRV_5 525 0x0000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR @@ -27485,8 +27485,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH 524 0x0064 //TX_DR_RESRV_5 525 0x1000 //TX_DR_RESRV_6 -526 0x0000 //TX_DR_RESRV_7 -527 0x0000 //TX_DR_RESRV_8 +526 0x122E //TX_DR_RESRV_7 +527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH 529 0x399A //TX_CORR_THR 530 0x0004 //TX_SNR_THR diff --git a/audio/shiba/tuning/fortemedia/HEADSET.dat b/audio/shiba/tuning/fortemedia/HEADSET.dat index 20ad7a654f8c06ea1b065f4df070fab4ba567147..ad0475127d0d153bb74e7c21fa5c204cd241a366 100644 GIT binary patch delta 806 zcmZ9K-77<39LGJ+Ip^8f$;-&a(y}EH?S`v!AyG@wav>`ditE|cE-1-`ic6qz~7sX2$e=rMHscih_1ME z^fnf!deWGygTyy&x9R^w>9G5*irxIhN@l8@TvmcHngDa}7-}P=3A_9Xy`YYKBBopokh#``^!cMi f750+;(&S#Mr&+H9`u$8+Rq~TXgG{aiM-P3!By8rp delta 806 zcmZ9K%PT}t9LMiD_uexeH-s!EO=i+WG#gfTAyJbWO%^hRP^`zSWMD-7Am`FzPhpK}Hz_PF51CNa0w!}F(8rRU(_cKLT{IRuguNn~b(N2eq-fS3YqagwKfAc;vG86T%@I~7ldP%B{mO_<0k08Q_M>k!NkEnN|8oWZ|6?3XI@t9NhbePSn8w9G4 zRIwJo50WLOBF#n1{_ALmLEuNjCYGX_0mC_2BVcJL=NZ(b9M&MHPD#rQ%o#oAhSgh5 z?gl3@f4V_8VE0WEyZMim%2bzeSqa8y0?fT*sP(We?D8x0f;#evn5t}q%#|*r&mJV| fZ!hUjUGAl3n)SLM Date: Wed, 13 Sep 2023 21:54:50 +0000 Subject: [PATCH 56/75] DO NOT MERGE displayport: Move displayport configuration to device. Move displayport configuration to device level makefile. Test: manual (check /sys/module/exynos_drm/parameters/dp_enabled) Bug: 300167292 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d79c602a264f8daf4d0256d834c172f1b26f9a2a) Merged-In: I04be078cc71d54ef0f943578fdefee33cb18332e Change-Id: I04be078cc71d54ef0f943578fdefee33cb18332e --- device-husky.mk | 4 ++++ device-shiba.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index ec26da3..c7e0d53 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -401,3 +401,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# DisplayPort should be disabled by default (b/300167292) +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.usb.displayport.enabled=0 diff --git a/device-shiba.mk b/device-shiba.mk index 4753538..1662997 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -376,3 +376,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# DisplayPort should be disabled by default (b/300167292) +PRODUCT_VENDOR_PROPERTIES += \ + persist.vendor.usb.displayport.enabled=0 From 22a99356543a341e7673b885066c62f6d7a39c16 Mon Sep 17 00:00:00 2001 From: Jia-yi Chen Date: Wed, 13 Sep 2023 11:15:27 -0700 Subject: [PATCH 57/75] Restrict foreground cpuset to cpu0-5 when camera launch Bug: 297789578 Test: Boot & check perfetto traces Change-Id: I3d38149afb36f0b50804e2cced45d057482206ff --- perf/powerhint-husky.json | 21 +++++++++++++++++++++ perf/powerhint-ripcurrent.json | 21 +++++++++++++++++++++ perf/powerhint-shiba.json | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index dc514f4..62a8b68 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -317,6 +317,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "FGCpuset", + "Path": "/dev/cpuset/foreground/cpus", + "Values": [ + "0-5", + "0-7" + ], + "ResetOnInit": true + }, { "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", @@ -1101,6 +1110,12 @@ "Duration": 1000, "Value": "1" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "FGCpuset", + "Duration": 1000, + "Value": "0-5" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1143,6 +1158,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "FGCpuset", + "Duration": 2000, + "Value": "0-5" + }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 96b400c..87404ac 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -303,6 +303,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "FGCpuset", + "Path": "/dev/cpuset/foreground/cpus", + "Values": [ + "0-5", + "0-7" + ], + "ResetOnInit": true + }, { "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", @@ -1083,6 +1092,12 @@ "Duration": 1000, "Value": "1" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "FGCpuset", + "Duration": 1000, + "Value": "0-5" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -1107,6 +1122,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "FGCpuset", + "Duration": 2000, + "Value": "0-5" + }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 6638a8f..c3d92d5 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -307,6 +307,15 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "FGCpuset", + "Path": "/dev/cpuset/foreground/cpus", + "Values": [ + "0-5", + "0-7" + ], + "ResetOnInit": true + }, { "Name": "CDCpuset", "Path": "/dev/cpuset/camera-daemon/cpus", @@ -1091,6 +1100,12 @@ "Duration": 1000, "Value": "1" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "FGCpuset", + "Duration": 1000, + "Value": "0-5" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1133,6 +1148,12 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "FGCpuset", + "Duration": 2000, + "Value": "0-5" + }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUBigClusterMaxFreq", From bd4a7d3d3587b51509e36b356d19f12f8766f59f Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 13 Sep 2023 13:57:12 -0700 Subject: [PATCH 58/75] Optimize the thermal policy for camera mode Bug: 297789578 Test: Check CPU throttling when running camera by emul_temp Change-Id: Id97e55d3c219d15fd9d0d70f5b98e476e0385cde --- perf/powerhint-husky.json | 21 +++++++++++++++- perf/powerhint-shiba.json | 21 +++++++++++++++- thermal/thermal_info_config_husky.json | 34 +++++++++++++++++++++++--- thermal/thermal_info_config_shiba.json | 34 +++++++++++++++++++++++--- 4 files changed, 100 insertions(+), 10 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index dc514f4..b35ee75 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -710,7 +710,8 @@ "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile", "Values": [ "", - "game" + "game", + "camera" ], "DefaultIndex": 0, "ResetOnInit": true, @@ -1539,6 +1540,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "VIRTUAL-SKIN-CPU-MID", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1689,6 +1696,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "VIRTUAL-SKIN-CPU-MID", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1815,6 +1828,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "VIRTUAL-SKIN-CPU-MID", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "VIRTUAL-SKIN-CPU-HIGH", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 6638a8f..c8fbd4d 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -700,7 +700,8 @@ "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile", "Values": [ "", - "game" + "game", + "camera" ], "DefaultIndex": 0, "ResetOnInit": true, @@ -1427,6 +1428,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "VIRTUAL-SKIN-CPU-MID", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1577,6 +1584,12 @@ "Duration": 0, "Value": "4-8" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "VIRTUAL-SKIN-CPU-MID", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "VIRTUAL-SKIN-CPU-HIGH", @@ -1703,6 +1716,12 @@ "Duration": 0, "Value": "0-8" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "VIRTUAL-SKIN-CPU-MID", + "Duration": 0, + "Value": "camera" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "VIRTUAL-SKIN-CPU-HIGH", diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index f69738f..9993265 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -473,6 +473,26 @@ "Disabled":true } ] + }, + { + "Mode": "camera", + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-1", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-2", + "MaxReleaseStep": 1, + "Disabled":true + } + ] } ] }, @@ -518,7 +538,7 @@ }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], + "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, "CdevCeiling": [0, 13, 13, 13, 13, 13, 13] @@ -550,18 +570,24 @@ "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, - "Disabled":true + "MaxThrottleStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] }, { "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, - "Disabled":true + "MaxThrottleStep": 2, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] }, { "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, - "Disabled":true + "MaxThrottleStep": 2, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] } ] } diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 9c71dbe..718b563 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -441,6 +441,26 @@ "Disabled":true } ] + }, + { + "Mode": "camera", + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-1", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-2", + "MaxReleaseStep": 1, + "Disabled":true + } + ] } ] }, @@ -486,7 +506,7 @@ }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.252, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], + "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, "MaxThrottleStep": 2, "CdevCeiling": [0, 13, 13, 13, 13, 13, 13] @@ -518,18 +538,24 @@ "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, - "Disabled":true + "MaxThrottleStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] }, { "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428], "MaxReleaseStep": 1, - "Disabled":true + "MaxThrottleStep": 2, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] }, { "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225], "MaxReleaseStep": 1, - "Disabled":true + "MaxThrottleStep": 2, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] } ] } From 0418ec59b622fc1ad7143f5d4f99605d9e4040c1 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 29 Aug 2023 13:28:21 -0700 Subject: [PATCH 59/75] thermal: optimize charging thermal parameters Bug: 290828382 Test: adb shell dumpsys android.hardware.thermal.IThermal/default Change-Id: Ib1ca94f81e8325ab2b40bffd62308998296a18d4 --- thermal/thermal_info_config_charge_husky.json | 20 +++++++++---------- thermal/thermal_info_config_charge_shiba.json | 18 ++++++++--------- thermal/thermal_info_config_husky.json | 20 +++++++++---------- thermal/thermal_info_config_shiba.json | 18 ++++++++--------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index dd6af4a..626c2b4 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -206,27 +206,27 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default":1302 + "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1383 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 9d5dc07..a7d5436 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -239,27 +239,27 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1066, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2066, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default":1099 + "MaxAllocPower":["NAN", "NAN", 6412, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1066 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2] + "PowerWeight": [0.16, 0.16, 0.16, 0.16, 0.32, 0.32, 0.32] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 4703935..7fae7b7 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -827,27 +827,27 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default":1302 + "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1383 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 4d24a0b..e5582fc 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -839,27 +839,27 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1066, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2066, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default":1099 + "MaxAllocPower":["NAN", "NAN", 6412, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1066 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2] + "PowerWeight": [0.16, 0.16, 0.16, 0.16, 0.32, 0.32, 0.32] } ], "BindedCdevInfo": [ From 0ee3491a8cc5f8966afc5f8c20e17770f1a376a6 Mon Sep 17 00:00:00 2001 From: jimmyshiu Date: Mon, 11 Sep 2023 10:23:28 +0000 Subject: [PATCH 60/75] powerhint: PID and CPD perf tuning MID cluster power down tuning for SB3. ADPF PID tuning for P23 60/90Hz. Bug: 298306983 Test: PtsUiBench Change-Id: I9837d165d611fab4b94ad97718babdf5fe1c23f4 --- perf/powerhint-husky.json | 8 ++++---- perf/powerhint-shiba.json | 24 ++++++++++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 491b376..0b01fca 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2738,7 +2738,7 @@ "Name": "REFRESH_90FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.7, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, @@ -2746,7 +2746,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 161, + "UclampMin_Init": 231, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -2762,7 +2762,7 @@ "Name": "REFRESH_60FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.5, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, @@ -2770,7 +2770,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 161, + "UclampMin_Init": 231, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index edd1c4e..efc8552 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -221,6 +221,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "MidClusterPowerDownTargetResidency", + "Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl1_target_residency", + "Values": [ + "750000", + "10000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", @@ -1005,6 +1015,12 @@ "Duration": 0, "Value": "10000" }, + { + "PowerHint": "DISPLAY_INACTIVE", + "Node": "MidClusterPowerDownTargetResidency", + "Duration": 0, + "Value": "10000" + }, { "PowerHint": "DISPLAY_INACTIVE", "Node": "TAPreferIdle", @@ -2626,7 +2642,7 @@ "Name": "REFRESH_90FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.7, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, @@ -2634,7 +2650,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 161, + "UclampMin_Init": 231, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -2650,7 +2666,7 @@ "Name": "REFRESH_60FPS", "PID_On": true, "PID_Po": 2.0, - "PID_Pu": 1.0, + "PID_Pu": 0.5, "PID_I": 0.0, "PID_I_Init": 200, "PID_I_High": 512, @@ -2658,7 +2674,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 161, + "UclampMin_Init": 231, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, From be574d03e878afa23ced84cf78cebff63aff8e20 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Thu, 21 Sep 2023 15:12:42 +0800 Subject: [PATCH 61/75] DO NOT MERGE: Disable 32k dual mic support on P23 project Bug: 301374829 Test: Ensure 32k dual mic config will not be selected Change-Id: I923341dffc3dfa16efbef7c66c6c420a78cd0247 --- device-husky.mk | 4 ++++ device-ripcurrent.mk | 4 ++++ device-shiba.mk | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index ba213ac..e509135 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -201,6 +201,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true +# Not support LE Audio dual mic SWB call based on the current launch strategy +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.dual_bidirection_swb.supported=false + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 0965f4f..79406da 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -166,6 +166,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true +# Not support LE Audio dual mic SWB call based on the current launch strategy +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.dual_bidirection_swb.supported=false + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service diff --git a/device-shiba.mk b/device-shiba.mk index 4753538..92b618d 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -192,6 +192,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true +# Not support LE Audio dual mic SWB call based on the current launch strategy +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.dual_bidirection_swb.supported=false + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true From 4670216e61b6bd080b16887e443ce7f416854f03 Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Tue, 19 Sep 2023 12:36:14 +0000 Subject: [PATCH 62/75] [RESTRICT AUTOMERGE] set normal brightness controller to ture Bug: 300259502 test: check dumpsys display Change-Id: Ia7811a271eb6072927aba3edec8bec11d8781468 --- husky/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ shiba/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index 890bdc0..3023ad7 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -48,6 +48,9 @@ 0.087114228 + + true + 0.098176353 + + true + - M 504,66.5 - a 36,36 0 0 1 72,0 - a 36,36 0 0 1 -72,0 - Z + m 576,65.75 a 36.25,36.25 0 0 0 -72.5,0 36.25,36.25 0 0 0 72.5,0 z @left diff --git a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index a67e26b..2927e27 100644 --- a/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/shiba/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -49,10 +49,7 @@ - M 489.5,66 - a 50,50 0 0 1 100,0 - a 50,50 0 0 1 -100,0 - Z + m 589,65.75 a 49.25,49.25 0 0 0 -98.5,0 49.25,49.25 0 0 0 98.5,0 z From aecb9d8989472bc4f3edadacb57dbc26cdbe09cc Mon Sep 17 00:00:00 2001 From: paulsu Date: Mon, 25 Sep 2023 08:18:30 +0000 Subject: [PATCH 64/75] Enable tapered dvfs headroom in battery saver and thermal Bug: 295992028 Test: Boot to home Change-Id: I04e5b286e2fb5853bd0206f8024807fe7bcd11a4 Signed-off-by: paulsu --- perf/powerhint-husky.json | 12 ++++++++++++ perf/powerhint-ripcurrent.json | 12 ++++++++++++ perf/powerhint-shiba.json | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 0b01fca..8843d70 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2271,6 +2271,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "LOW_POWER", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -2450,6 +2456,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 87404ac..41ddbf1 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2060,6 +2060,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "LOW_POWER", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -2245,6 +2251,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index efc8552..767d903 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2175,6 +2175,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "LOW_POWER", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -2354,6 +2360,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", From 2ce3ab61b88f04c5bc8056edba764ca3eefc9187 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Mon, 18 Sep 2023 14:56:21 +0000 Subject: [PATCH 65/75] powerhint.json: Reset bg_uclamp_max on LAUNCH And disable uclamp_max_filter so that we don't accidentally impact LAUNCH time. Bug: 301807825 Signed-off-by: Qais Yousef Change-Id: I913b50fb6e2896de96873e550e6299b7294f6bec --- perf/powerhint-husky.json | 32 ++++++++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 32 ++++++++++++++++++++++++++++++++ perf/powerhint-shiba.json | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 0b01fca..00de893 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -261,6 +261,26 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUUClampMaxFilterEnable", + "Path": "/proc/vendor_sched/uclamp_max_filter_enable", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "BGUClampMaxBoost", + "Path": "/proc/vendor_sched/bg_uclamp_max", + "Values": [ + "130", + "512" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -808,6 +828,18 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "BGUClampMaxBoost", + "Duration": 5000, + "Value": "512" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 87404ac..1fd56a1 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -247,6 +247,26 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUUClampMaxFilterEnable", + "Path": "/proc/vendor_sched/uclamp_max_filter_enable", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "BGUClampMaxBoost", + "Path": "/proc/vendor_sched/bg_uclamp_max", + "Values": [ + "130", + "512" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -830,6 +850,18 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "BGUClampMaxBoost", + "Duration": 5000, + "Value": "512" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index efc8552..7f5017b 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -261,6 +261,26 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUUClampMaxFilterEnable", + "Path": "/proc/vendor_sched/uclamp_max_filter_enable", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "BGUClampMaxBoost", + "Path": "/proc/vendor_sched/bg_uclamp_max", + "Values": [ + "130", + "512" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -808,6 +828,18 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "BGUClampMaxBoost", + "Duration": 5000, + "Value": "512" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", From 271412790a6eba9107a860d400048ba8239cff01 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 27 Sep 2023 21:20:35 +0000 Subject: [PATCH 66/75] powerhint.json: Undo uclamp_max tuning in LAUNCH_EXTEND Bug: 301807825 Signed-off-by: Qais Yousef Change-Id: I0f0b6752c76f0f6c5f725801f91c57f8f1e289bf --- perf/powerhint-husky.json | 34 ++++++++++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 34 ++++++++++++++++++++++++++++++++++ perf/powerhint-shiba.json | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 142f0b8..bbb5662 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -281,6 +281,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -840,6 +850,12 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 5000, + "Value": "615" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -952,6 +968,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index a987091..0b022fc 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -267,6 +267,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -862,6 +872,12 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 5000, + "Value": "615" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -974,6 +990,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 14d971b..9f65124 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -281,6 +281,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "Dex2oatUClampMaxBoost", + "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Values": [ + "-2", + "615" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CAMUClampBoost", "Path": "/proc/vendor_sched/cam_uclamp_min", @@ -840,6 +850,12 @@ "Duration": 5000, "Value": "512" }, + { + "PowerHint": "LAUNCH", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 5000, + "Value": "615" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -952,6 +968,24 @@ "Duration": 2000, "Value": "0" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUUClampMaxFilterEnable", + "Duration": 2000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "BGUClampMaxBoost", + "Duration": 2000, + "Value": "512" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "Dex2oatUClampMaxBoost", + "Duration": 2000, + "Value": "615" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPULittleClusterDownRateLimitUs", From 0c21866e598238fe3f6441018390933cf7f83b0c Mon Sep 17 00:00:00 2001 From: David Kimmel Date: Mon, 25 Sep 2023 18:22:24 +0000 Subject: [PATCH 67/75] Game Mode Sched lib affinity Bug: 170648047 Test: sched / hints applied correctly Change-Id: I50b21880a671cb4b40110bc7ac3d75de6e2dc946 Signed-off-by: David Kimmel --- perf/powerhint-husky.json | 27 +++++++++++++++++++++++++++ perf/powerhint-ripcurrent.json | 27 +++++++++++++++++++++++++++ perf/powerhint-shiba.json | 27 +++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 142f0b8..7ab6960 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -766,6 +766,15 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "SchedLibMaskIn", + "Path": "/proc/vendor_sched/sched_lib_mask_in", + "Values": [ + "0x100", + "0x0" + ], + "ResetOnInit": true } ], "Actions": [ @@ -922,6 +931,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -982,6 +997,12 @@ "Duration": 2000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2428,6 +2449,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "SchedLibMaskIn", + "Duration": 0, + "Value": "0x100" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index a987091..842320b 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -788,6 +788,15 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "SchedLibMaskIn", + "Path": "/proc/vendor_sched/sched_lib_mask_in", + "Values": [ + "0x100", + "0x0" + ], + "ResetOnInit": true } ], "Actions": [ @@ -944,6 +953,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1004,6 +1019,12 @@ "Duration": 2000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2187,6 +2208,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "SchedLibMaskIn", + "Duration": 0, + "Value": "0x100" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 14d971b..0de3cde 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -766,6 +766,15 @@ "20 40" ], "ResetOnInit": true + }, + { + "Name": "SchedLibMaskIn", + "Path": "/proc/vendor_sched/sched_lib_mask_in", + "Values": [ + "0x100", + "0x0" + ], + "ResetOnInit": true } ], "Actions": [ @@ -922,6 +931,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -982,6 +997,12 @@ "Duration": 2000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "SchedLibMaskIn", + "Duration": 5000, + "Value": "0x100" + }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -2332,6 +2353,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "GAME", + "Node": "SchedLibMaskIn", + "Duration": 0, + "Value": "0x100" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", From ac5f43c32b08dd1bfc2cebe80830666d979bfed4 Mon Sep 17 00:00:00 2001 From: Austin Delgado Date: Mon, 2 Oct 2023 16:58:45 -0700 Subject: [PATCH 68/75] Update Husky bounding box to 10x10 Bug: 303089534 Test: N/A Change-Id: Ie94a884280be50b20f0fcb13d62fb98e1df86e19 --- husky/overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index 3023ad7..327a3af 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -304,5 +304,5 @@ true - 4 + 5 From 8d75e79214131f51d37819631e5c06c4e9e271f1 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 10 Oct 2023 22:31:06 +0000 Subject: [PATCH 69/75] Update shiba SVN to 5 Bug: 302612466 Change-Id: Ia71e9683bae5f106c382aaf0a1e6af9ddf30197b --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 7d417b3..820c1a1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=4 + ro.vendor.build.svn=5 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From ef61c564f856e41a084baf0d71708c498d3452c5 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 10 Oct 2023 22:46:09 +0000 Subject: [PATCH 70/75] Update husky SVN to 5 Bug: 302612466 Change-Id: I79dc78554b998cf871dc839f81669e29b5065836 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 96dd7aa..92f889d 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=4 + ro.vendor.build.svn=5 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 20a2f7b30c84a5a06d3dd7e47f39fcdcdc76ba36 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 11 Oct 2023 11:35:39 -0700 Subject: [PATCH 71/75] shusky: Replace NFC app with NFC apex Bug: 303286040 Test: Compiles Change-Id: Id4e1b40e5a077f8e0f1e342e01d28a9a1a34c4d0 --- device-husky.mk | 2 +- device-ripcurrent.mk | 2 +- device-shiba.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 92f889d..e41fa5b 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -82,7 +82,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 79406da..a9114c5 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st diff --git a/device-shiba.mk b/device-shiba.mk index 820c1a1..df57691 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -70,7 +70,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st From 5c500cb5b0dbea47f6f0f96f60f607313815145a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 10 Oct 2023 22:33:26 +0000 Subject: [PATCH 72/75] Update shiba SVN to 6 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9e15f1bfcd2059140f81aa5e40440db98aab53e) Merged-In: Id531d288fc06bf7c488799287f5d93dae77bc1f3 Change-Id: Id531d288fc06bf7c488799287f5d93dae77bc1f3 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 820c1a1..e523ae0 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -333,7 +333,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=6 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From d667847313c54965bcfe3fddfb00377ae8bff4c3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 10 Oct 2023 22:46:58 +0000 Subject: [PATCH 73/75] Update husky SVN to 6 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e27f637a4edd6fd99a21162ecce847106fecc47) Merged-In: Id8f52d6abb4c83ff3d862347c3100a18b5806d45 Change-Id: Id8f52d6abb4c83ff3d862347c3100a18b5806d45 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 92f889d..7ef9b87 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -352,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=6 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From ccea197344fb589d3c7a6dc36a004ceeaaa1147f Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Wed, 1 Nov 2023 07:19:37 +0800 Subject: [PATCH 74/75] gps: set high accuracy shape mode to 1 Only support CP LPP HA GAD shape for TMO Bug: 308489551 Test: CP LPP pass in carrier LAB (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f2da6ead27e3ea2a8cbee2c5deb942c05141474) Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e Change-Id: I38bce6825ac29b93a6691cee6cca312be3db874e --- location/gps.xml | 2 +- location/gps.xml.hk3 | 2 +- location/gps.xml.sb3 | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.hk3 | 2 +- location/gps_user.xml.sb3 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 7a6ce2c..774e206 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -58,7 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index 8ad70f0..2857dcf 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -58,7 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index 1c42ca0..bceb407 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -58,7 +58,7 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 9d42ff3..9f3bd02 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -57,7 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 94f5955..8a1d2b3 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -57,7 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index f19e50f..f74bce6 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -57,7 +57,7 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" - CpLppHighAccuracyShapeMode="2" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" From 9a64e8e1944aca32f24453a6ed706246d57cef58 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 9 Nov 2023 04:12:13 +0000 Subject: [PATCH 75/75] Revert "shusky: Replace NFC app with NFC apex" This reverts commit 20a2f7b30c84a5a06d3dd7e47f39fcdcdc76ba36. Reason for revert: Needed for revert topic: https://android-review.git.corp.google.com/q/topic:%22nfc_apex_revert%22 Bug: 309867188 Test: None Merged-In: Ie332e184ac83dcecac3eb62f8b17a683f22c9575 Change-Id: Id037ef8567ac6d0fd6fd15f6c625758b41181161 --- device-husky.mk | 2 +- device-ripcurrent.mk | 2 +- device-shiba.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index e41fa5b..92f889d 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -82,7 +82,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index a9114c5..79406da 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st diff --git a/device-shiba.mk b/device-shiba.mk index df57691..820c1a1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -70,7 +70,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st