From cdeb65a6c21855625ada571ce83b0fdf3d1e5ca8 Mon Sep 17 00:00:00 2001 From: millerliang Date: Mon, 10 May 2021 22:08:03 +0800 Subject: [PATCH 1/4] audio: remove bt path for raw and mmap playback In AOC, ULL support requires the sink to be ULL Speaker, Analog HP and USB are ULL Sinks, Modem and BT are LL Bug: 165737390 Test: OboeTester --> TEST OUTPUT Change-Id: I23da02a52586e2f5d017142b5947dd082cdc2c62 --- audio/oriole/config/audio_policy_configuration.xml | 12 ++++++------ ..._policy_configuration_a2dp_offload_disabled.xml | 6 +++--- ...o_policy_configuration_bluetooth_legacy_hal.xml | 6 +++--- audio/oriole/config/mixer_paths.xml | 14 -------------- audio/raven/config/audio_policy_configuration.xml | 12 ++++++------ ..._policy_configuration_a2dp_offload_disabled.xml | 6 +++--- ...o_policy_configuration_bluetooth_legacy_hal.xml | 6 +++--- audio/raven/config/mixer_paths.xml | 14 -------------- audio/slider/config/audio_policy_configuration.xml | 12 ++++++------ ..._policy_configuration_a2dp_offload_disabled.xml | 6 +++--- ...o_policy_configuration_bluetooth_legacy_hal.xml | 6 +++--- audio/slider/config/mixer_paths.xml | 14 -------------- .../whitefin/config/audio_policy_configuration.xml | 6 +++--- ..._policy_configuration_a2dp_offload_disabled.xml | 6 +++--- ...o_policy_configuration_bluetooth_legacy_hal.xml | 6 +++--- audio/whitefin/config/mixer_paths.xml | 14 -------------- 16 files changed, 45 insertions(+), 101 deletions(-) diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 6201639..62f5b9d 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -182,21 +182,21 @@ + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml index 36df571..55dc0ee 100644 --- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -169,11 +169,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index a4284b0..7c21ce4 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -169,11 +169,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index 8ef0001..07cf8e0 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -380,13 +380,6 @@ - - - - - - - @@ -407,13 +400,6 @@ - - - - - - - diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 6201639..62f5b9d 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -182,21 +182,21 @@ + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml index 36df571..55dc0ee 100644 --- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -169,11 +169,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index a4284b0..7c21ce4 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -169,11 +169,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index 18c9957..240749c 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -398,13 +398,6 @@ - - - - - - - @@ -434,13 +427,6 @@ - - - - - - - diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml index 4a7d24e..5e5a151 100644 --- a/audio/slider/config/audio_policy_configuration.xml +++ b/audio/slider/config/audio_policy_configuration.xml @@ -180,21 +180,21 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> diff --git a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml index 36df571..55dc0ee 100644 --- a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -169,11 +169,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> diff --git a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml index a4284b0..7c21ce4 100644 --- a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -169,11 +169,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/> diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml index 1d7fe9f..ce999e9 100644 --- a/audio/slider/config/mixer_paths.xml +++ b/audio/slider/config/mixer_paths.xml @@ -344,13 +344,6 @@ - - - - - - - @@ -371,13 +364,6 @@ - - - - - - - diff --git a/audio/whitefin/config/audio_policy_configuration.xml b/audio/whitefin/config/audio_policy_configuration.xml index 6b27cb2..322c4fe 100644 --- a/audio/whitefin/config/audio_policy_configuration.xml +++ b/audio/whitefin/config/audio_policy_configuration.xml @@ -164,11 +164,11 @@ + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> diff --git a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml index caaafdf..dba03f3 100644 --- a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -164,11 +164,11 @@ + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> diff --git a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 13119ce..c04ae6e 100644 --- a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -164,11 +164,11 @@ + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> + sources="primary output,deep buffer,compressed_offload,voip_rx"/> diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml index c617137..ab6bc10 100644 --- a/audio/whitefin/config/mixer_paths.xml +++ b/audio/whitefin/config/mixer_paths.xml @@ -393,13 +393,6 @@ - - - - - - - @@ -429,13 +422,6 @@ - - - - - - - From b794f757637cfa6575c0b2c5e43d4edbad2a63b5 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 11 May 2021 15:08:22 +0800 Subject: [PATCH 2/4] audio: waves: support handset device Bug: 165776638 Test: VOIP / voice/ playback/ record Signed-off-by: Jasmine Cha Change-Id: I2133cedac1cf718e3632df5f292a2688fc009428 --- audio/oriole/tuning/waves/waves_config.ini | 4 ++-- audio/raven/tuning/waves/waves_config.ini | 4 ++-- audio/slider/tuning/waves/waves_config.ini | 4 ++-- audio/whitefin/tuning/waves/waves_config.ini | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/oriole/tuning/waves/waves_config.ini b/audio/oriole/tuning/waves/waves_config.ini index ce31f42..99b9604 100644 --- a/audio/oriole/tuning/waves/waves_config.ini +++ b/audio/oriole/tuning/waves/waves_config.ini @@ -45,5 +45,5 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so [CUSTOM_ACTION_256] CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC diff --git a/audio/raven/tuning/waves/waves_config.ini b/audio/raven/tuning/waves/waves_config.ini index ce31f42..99b9604 100644 --- a/audio/raven/tuning/waves/waves_config.ini +++ b/audio/raven/tuning/waves/waves_config.ini @@ -45,5 +45,5 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so [CUSTOM_ACTION_256] CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC diff --git a/audio/slider/tuning/waves/waves_config.ini b/audio/slider/tuning/waves/waves_config.ini index ce31f42..99b9604 100644 --- a/audio/slider/tuning/waves/waves_config.ini +++ b/audio/slider/tuning/waves/waves_config.ini @@ -45,5 +45,5 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so [CUSTOM_ACTION_256] CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC diff --git a/audio/whitefin/tuning/waves/waves_config.ini b/audio/whitefin/tuning/waves/waves_config.ini index ce31f42..99b9604 100644 --- a/audio/whitefin/tuning/waves/waves_config.ini +++ b/audio/whitefin/tuning/waves/waves_config.ini @@ -45,5 +45,5 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so [CUSTOM_ACTION_256] CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC -CASE_2=PRIORITY:1,NUMBERS:2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL -CASE_3=PRIORITY:2,NUMBERS:4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC +CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL +CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC From 82756614b28366f14aadc51de4424a02c85f0f91 Mon Sep 17 00:00:00 2001 From: Long Ling Date: Fri, 30 Apr 2021 15:52:57 -0700 Subject: [PATCH 3/4] display: add device specific adaptive calibration file Bug: 184096624 Change-Id: I813b9310291f33c81ace8e82ebf1a71284c7e795 --- device-oriole.mk | 4 ++++ device-raven.mk | 3 ++- oriole/display_colordata_dev_cal0.pb | Bin 0 -> 1036 bytes raven/display_colordata_dev_cal0.pb | Bin 0 -> 1020 bytes 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 oriole/display_colordata_dev_cal0.pb create mode 100644 raven/display_colordata_dev_cal0.pb diff --git a/device-oriole.mk b/device-oriole.mk index e5c1c94..9fc07fd 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -62,6 +62,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/raviole/media_profiles_oriole.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml +# Display Config +PRODUCT_COPY_FILES += \ + device/google/raviole/oriole/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb + # NFC PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ diff --git a/device-raven.mk b/device-raven.mk index e55e0b9..248d7ba 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -63,7 +63,8 @@ PRODUCT_COPY_FILES += \ # Display Config PRODUCT_COPY_FILES += \ - device/google/raviole/raven/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb + device/google/raviole/raven/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb \ + device/google/raviole/raven/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb # NFC PRODUCT_COPY_FILES += \ diff --git a/oriole/display_colordata_dev_cal0.pb b/oriole/display_colordata_dev_cal0.pb new file mode 100644 index 0000000000000000000000000000000000000000..c9343cc2d37ef2a45758205413213ecc4c43e515 GIT binary patch literal 1036 zcmd7Pzi!$<9Ki9~2iTZk!2B_gKe9R^ip}AomZ_=Ku}jjuGV#T-;@Xi71KV%zNZeG(j;n=Hw4CyBRtkRRS(U8Z54#i1Ky#r@|jkF$ih zf3vxEKVDvc`f%lvG+HEC8YS@pdwA*jD{rw}`D^TL_65m9vfW4Sjug9BcjQpaej-D| z-s`#Vy|KO{Flr+<+Eu z!3jTsHgC%|HHBGrcn7+?3q9Tgi(Am=eHe&AITXWkBt~E}TiSG7jmrt2$O)UuDLa*? z>`b1qb9v4#tmiZ{eNHp8AIPYCbL{#5GoxyWDB?(?vn{1Ia#Z=Kufz literal 0 HcmV?d00001 diff --git a/raven/display_colordata_dev_cal0.pb b/raven/display_colordata_dev_cal0.pb new file mode 100644 index 0000000000000000000000000000000000000000..ba2ea2caa6e0000da109887d5814949347964bf4 GIT binary patch literal 1020 zcmd7POHRT-0Dxhqr98^}4ds!>B|(_BJd~9XZ@>u(Oe(R0X@!K{tlc%1OlTq6zEAWhaJE!HA!)-IgWjCM{loex=!nQ+)0 z!0W$i6bKMVOu{n#b_*gr5-9v1)p#|i@fxYKI? Date: Tue, 11 May 2021 19:20:51 +0800 Subject: [PATCH 4/4] Adjust R4 rounded corner & punch hole anti-aliasing 1) Adjust the position of punch hole to match the H/W display 2) Previously, there wasn't rounded corner drawable for raven, R4 adapted with gs101 customization by default. Test: make and flash ROM Test: Observe rounded corner and punch hole Bug: 179171408 Change-Id: Ib68797c870fb5ee1208c844a9863090856ad8ee7 --- .../base/core/res/res/values/config.xml | 14 ++++++----- .../res/drawable/rounded_corner_bottom.xml | 24 +++++++++++++++++++ .../res/drawable/rounded_corner_top.xml | 24 +++++++++++++++++++ .../packages/SystemUI/res/values/config.xml | 14 +++++++++++ 4 files changed, 70 insertions(+), 6 deletions(-) create mode 100644 raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml create mode 100644 raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 91fed9e..836fb1c 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -33,21 +33,23 @@ - M 680,71 - a 42,42 0 1 0 84,0 42,42 0 1 0 -84,0 + M 677,72 + a 42,42 0 1 0 84,0 + a 42,42 0 1 0 -84,0 Z @left - M 664,13 - h 116 - v 116 - h -116 + M 655,0 + h 126 + v 130 + h -126 Z @left + 25px diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml new file mode 100644 index 0000000..016390f --- /dev/null +++ b/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_bottom.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml new file mode 100644 index 0000000..c1ab6e1 --- /dev/null +++ b/raven/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded_corner_top.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 8f9f879..a213966 100644 --- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -52,5 +52,19 @@ 0 0 + + true + + + + M 661,72 + a 57,57 0 1 0 114,0 + a 57,57 0 1 0 -114,0 + Z + + + + 1 +