From 4e454fff1ba94512e94606f74492f656f6c84dbe Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 22 Feb 2023 16:41:45 +0800 Subject: [PATCH 1/3] audio: Merge telephony tuning tables 1.Handset - Fine tune frequency response for the telephony report of T-Mobile. Files from the latest attachment on b/270290106 Bug: 270290106 Test: verified by huangsean@ Change-Id: I0cd7c9eb2eadfe93b295f1669103ac36eb477026 --- audio/felix/tuning/fortemedia/HANDSET.dat | Bin 255674 -> 255674 bytes audio/felix/tuning/fortemedia/HANDSET.mods | 80 ++++++++++----------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/audio/felix/tuning/fortemedia/HANDSET.dat b/audio/felix/tuning/fortemedia/HANDSET.dat index 5bdba02058defa6b902b9787b82898cba9735cd4..b78b0d3034898955dcfbfd382926e8db41a34ee8 100644 GIT binary patch delta 266 zcmdmWmVeh-{teHp*&=cb8$5hAzp-v>8~UvHmnU&29or>W>|&RGA}OipL36s?7y1 zCF80!h0QO>ktrf<+hQg@w#`xZ|1fcdr5HB&1sF9%_-#&jRL6+KpZvl4-Q;UeCLjrI vE_jNm-Gt+8MjY(&2%dk;i7tl?e8<0PuBnd6q9YZ delta 242 zcmdmWmVeh-{teHp*W>|&RGA}OipL36s?7y1 zCF80!W&5v1Od@QXqwfD<;)2*?)DYpZIpI+qie1;9OhA?{c#10h>^X{b!wXdDZ?BN0 dnIZpUHf>1^@%6XwCot diff --git a/audio/felix/tuning/fortemedia/HANDSET.mods b/audio/felix/tuning/fortemedia/HANDSET.mods index de0277f..553e8e2 100644 --- a/audio/felix/tuning/fortemedia/HANDSET.mods +++ b/audio/felix/tuning/fortemedia/HANDSET.mods @@ -1,7 +1,7 @@ #PLATFORM_NAME gChip #EXPORT_FLAG HANDSET #SINGLE_API_VER 1.2.1 -#SAVE_TIME 2023-02-16 12:55:59 +#SAVE_TIME 2023-02-22 16:23:24 #CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB #PARAM_MODE FULL @@ -3833,8 +3833,8 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 +49 0x6C58 //RX_FDEQ_GAIN_10 +50 0x4C48 //RX_FDEQ_GAIN_11 51 0x4858 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 @@ -3932,8 +3932,8 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 +49 0x6C58 //RX_FDEQ_GAIN_10 +50 0x4C48 //RX_FDEQ_GAIN_11 51 0x4858 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 @@ -4031,8 +4031,8 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 +49 0x6C58 //RX_FDEQ_GAIN_10 +50 0x4C48 //RX_FDEQ_GAIN_11 51 0x4858 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 @@ -4130,8 +4130,8 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 +49 0x6C58 //RX_FDEQ_GAIN_10 +50 0x4C48 //RX_FDEQ_GAIN_11 51 0x4858 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 @@ -4229,8 +4229,8 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 +49 0x6C58 //RX_FDEQ_GAIN_10 +50 0x4C48 //RX_FDEQ_GAIN_11 51 0x4858 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 @@ -4328,8 +4328,8 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 +49 0x6C58 //RX_FDEQ_GAIN_10 +50 0x4C48 //RX_FDEQ_GAIN_11 51 0x4858 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 @@ -4427,8 +4427,8 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 +49 0x6C58 //RX_FDEQ_GAIN_10 +50 0x4C48 //RX_FDEQ_GAIN_11 51 0x4858 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 @@ -13935,8 +13935,8 @@ 574 0x4A48 //TX_FDEQ_GAIN_7 575 0x4242 //TX_FDEQ_GAIN_8 576 0x4C50 //TX_FDEQ_GAIN_9 -577 0x5252 //TX_FDEQ_GAIN_10 -578 0x6058 //TX_FDEQ_GAIN_11 +577 0x524E //TX_FDEQ_GAIN_10 +578 0x5658 //TX_FDEQ_GAIN_11 579 0x5656 //TX_FDEQ_GAIN_12 580 0x5670 //TX_FDEQ_GAIN_13 581 0x7070 //TX_FDEQ_GAIN_14 @@ -14513,9 +14513,9 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 -51 0x4858 //RX_FDEQ_GAIN_12 +49 0x6456 //RX_FDEQ_GAIN_10 +50 0x504E //RX_FDEQ_GAIN_11 +51 0x4E58 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 54 0x4848 //RX_FDEQ_GAIN_15 @@ -14612,9 +14612,9 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 -51 0x4858 //RX_FDEQ_GAIN_12 +49 0x6456 //RX_FDEQ_GAIN_10 +50 0x504E //RX_FDEQ_GAIN_11 +51 0x4E58 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 54 0x4848 //RX_FDEQ_GAIN_15 @@ -14711,9 +14711,9 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 -51 0x4858 //RX_FDEQ_GAIN_12 +49 0x6456 //RX_FDEQ_GAIN_10 +50 0x504E //RX_FDEQ_GAIN_11 +51 0x4E58 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 54 0x4848 //RX_FDEQ_GAIN_15 @@ -14810,9 +14810,9 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 -51 0x4858 //RX_FDEQ_GAIN_12 +49 0x6456 //RX_FDEQ_GAIN_10 +50 0x504E //RX_FDEQ_GAIN_11 +51 0x4E58 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 54 0x4848 //RX_FDEQ_GAIN_15 @@ -14909,9 +14909,9 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 -51 0x4858 //RX_FDEQ_GAIN_12 +49 0x6456 //RX_FDEQ_GAIN_10 +50 0x504E //RX_FDEQ_GAIN_11 +51 0x4E58 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 54 0x4848 //RX_FDEQ_GAIN_15 @@ -15008,9 +15008,9 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 -51 0x4858 //RX_FDEQ_GAIN_12 +49 0x6456 //RX_FDEQ_GAIN_10 +50 0x504E //RX_FDEQ_GAIN_11 +51 0x4E58 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 54 0x4848 //RX_FDEQ_GAIN_15 @@ -15107,9 +15107,9 @@ 46 0xA6A4 //RX_FDEQ_GAIN_7 47 0xB69E //RX_FDEQ_GAIN_8 48 0x9074 //RX_FDEQ_GAIN_9 -49 0x6C5C //RX_FDEQ_GAIN_10 -50 0x5048 //RX_FDEQ_GAIN_11 -51 0x4858 //RX_FDEQ_GAIN_12 +49 0x6456 //RX_FDEQ_GAIN_10 +50 0x504E //RX_FDEQ_GAIN_11 +51 0x4E58 //RX_FDEQ_GAIN_12 52 0x5858 //RX_FDEQ_GAIN_13 53 0x4848 //RX_FDEQ_GAIN_14 54 0x4848 //RX_FDEQ_GAIN_15 @@ -53985,8 +53985,8 @@ 574 0x4A48 //TX_FDEQ_GAIN_7 575 0x4242 //TX_FDEQ_GAIN_8 576 0x4C50 //TX_FDEQ_GAIN_9 -577 0x5252 //TX_FDEQ_GAIN_10 -578 0x6058 //TX_FDEQ_GAIN_11 +577 0x524E //TX_FDEQ_GAIN_10 +578 0x5658 //TX_FDEQ_GAIN_11 579 0x5656 //TX_FDEQ_GAIN_12 580 0x5670 //TX_FDEQ_GAIN_13 581 0x7070 //TX_FDEQ_GAIN_14 From 4ff59efecd8be0b9c2b0f40cb1a643ff3608d2f6 Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Thu, 23 Feb 2023 11:22:34 -0800 Subject: [PATCH 2/3] Enable country code update during setup wizard Bug: 267944733 Test: manual with various network Change-Id: I3ed9becb9d5086ff49f1ea321296bd0f2ee18667 --- rro_overlays/WifiOverlay/res/values/config.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 9614f5c..c7337a6 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -156,4 +156,9 @@ true + + + true From e4fcc3d194a5ff93b79e97f87e1d792f77910643 Mon Sep 17 00:00:00 2001 From: millerliang Date: Fri, 10 Feb 2023 18:02:02 +0800 Subject: [PATCH 3/3] audio:enable mmap and raw on BT AoC can support mmap on BT both playback and recording after gpar/322484. Bug: 232205959 Test: OboeTester Signed-off-by: millerliang Change-Id: I95f6d500c259a14e5da23397c799b339d8128b36 --- .../felix/config/audio_policy_configuration.xml | 16 ++++++++-------- ...licy_configuration_a2dp_offload_disabled.xml | 10 +++++----- ...olicy_configuration_bluetooth_legacy_hal.xml | 10 +++++----- audio/felix/config/mixer_paths.xml | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/audio/felix/config/audio_policy_configuration.xml b/audio/felix/config/audio_policy_configuration.xml index 41b91bb..720d8db 100644 --- a/audio/felix/config/audio_policy_configuration.xml +++ b/audio/felix/config/audio_policy_configuration.xml @@ -183,21 +183,21 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -208,9 +208,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml index b4eaf0c..eb8560c 100644 --- a/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -173,11 +173,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -188,9 +188,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 7fd7f28..1863d5a 100644 --- a/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -169,11 +169,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -184,9 +184,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/felix/config/mixer_paths.xml b/audio/felix/config/mixer_paths.xml index ca5f366..35f399f 100644 --- a/audio/felix/config/mixer_paths.xml +++ b/audio/felix/config/mixer_paths.xml @@ -175,6 +175,7 @@ + @@ -409,6 +410,10 @@ + + + + @@ -423,6 +428,10 @@ + + + + @@ -620,6 +629,10 @@ + + + + @@ -628,6 +641,10 @@ + + + + >