From 2c23baa07dbd584fd4be21914540b888ea667227 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 7 Dec 2023 11:55:54 -0800 Subject: [PATCH 1/3] thermal: Keep LIGHT-tier's ceiling before 43 degC for camera Bug: 315264384 Test: run camcorder Change-Id: I155f97d950e73795693232cf56e647b2c98c64fe --- thermal/thermal_info_config_husky.json | 6 +++--- thermal/thermal_info_config_shiba.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 9e659ee..b08761a 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -582,21 +582,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 2, 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, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 6, 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, "MaxThrottleStep": 2, - "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] + "CdevCeiling": [0, 8, 12, 12, 12, 12, 12] } ] } diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 988dac3..bc6bdf1 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -550,21 +550,21 @@ "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] + "CdevCeiling": [0, 2, 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, "MaxThrottleStep": 2, - "CdevCeiling": [0, 9, 9, 9, 9, 9, 9] + "CdevCeiling": [0, 6, 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, "MaxThrottleStep": 2, - "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] + "CdevCeiling": [0, 8, 12, 12, 12, 12, 12] } ] } From bfa3513cdc6acf4e43dcb302b28f1cbec3c8c53d Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Mon, 25 Dec 2023 14:38:15 +0800 Subject: [PATCH 2/3] audio: support incall capture dl/ul concurrent recording Bug: 317726514 Test: Verified by test build Change-Id: I6095545e001cdc1f38e5303d5f28d699c6e8f02f Signed-off-by: Carter Hsu --- audio/husky/config/audio_policy_configuration.xml | 2 +- .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- .../config/audio_policy_configuration_bluetooth_legacy_hal.xml | 2 +- .../config/audio_policy_configuration_le_offload_disabled.xml | 2 +- audio/shiba/config/audio_policy_configuration.xml | 2 +- .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +- .../config/audio_policy_configuration_bluetooth_legacy_hal.xml | 2 +- .../config/audio_policy_configuration_le_offload_disabled.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml index a9120dd..ac241e4 100644 --- a/audio/husky/config/audio_policy_configuration.xml +++ b/audio/husky/config/audio_policy_configuration.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + 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 d0dbd1e..7175981 100644 --- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 5c5602c..0755fec 100644 --- a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -90,7 +90,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml index 82b3017..bfd76a7 100644 --- a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml index a9120dd..9c8f2f9 100644 --- a/audio/shiba/config/audio_policy_configuration.xml +++ b/audio/shiba/config/audio_policy_configuration.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml index d0dbd1e..7175981 100644 --- a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 5c5602c..0755fec 100644 --- a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -90,7 +90,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + diff --git a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml index 82b3017..0f6f636 100644 --- a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml @@ -97,7 +97,7 @@ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> - + From 8ce7e53cffc6baf2d0f530bf86203c5878900096 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 12 Dec 2023 15:59:10 +0800 Subject: [PATCH 3/3] audio: add HIDL SoundDose libraries & framework config Test: build pass, playback pass Bug: 315916092 Change-Id: Id851229b31a5d1ddcac30e3e92010fd2a55b76a4 Signed-off-by: vincenttew --- audio/husky/config/audio_platform_configuration.xml | 1 + audio/shiba/config/audio_platform_configuration.xml | 1 + device-husky.mk | 5 +++++ device-shiba.mk | 5 +++++ husky/overlay/frameworks/base/core/res/res/values/config.xml | 2 ++ shiba/overlay/frameworks/base/core/res/res/values/config.xml | 2 ++ 6 files changed, 16 insertions(+) diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 86e910b..60f0be3 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -308,6 +308,7 @@ + diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 86e910b..60f0be3 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -308,6 +308,7 @@ + diff --git a/device-husky.mk b/device-husky.mk index bd32b27..1e34d5f 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -124,6 +124,11 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# Sound Dose +PRODUCT_PACKAGES += \ + android.hardware.audio.sounddose-vendor-impl \ + audio_sounddose_aoc + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false diff --git a/device-shiba.mk b/device-shiba.mk index 9d6177f..5ec1236 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -115,6 +115,11 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# Sound Dose +PRODUCT_PACKAGES += \ + android.hardware.audio.sounddose-vendor-impl \ + audio_sounddose_aoc + # Audio CCA property PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.cca.enabled=false 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 327a3af..38f08d7 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -292,6 +292,8 @@ http://www.gstatic.com/android/sms/G1MNW.xml + true + 0.335 diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index 33399cb..9c22278 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -286,6 +286,8 @@ http://www.gstatic.com/android/sms/GKWS6.xml + true + 0.335