From 8a702b11f5fabfbcb1aff494011b7134e744be82 Mon Sep 17 00:00:00 2001 From: David Li Date: Wed, 17 Mar 2021 17:35:14 +0800 Subject: [PATCH 1/5] audio: add mixer_path for call screen mode 4 and hearing aid Test: call screen mode 2 and 4, normal voice call Bug: 165750425 Bug: 177914228 Bug: 181924779 Bug: 165753519 Change-Id: I2373dab47e54bda8b8bb9d7d4fbcde42c2f921d0 --- audio/oriole/config/mixer_paths.xml | 30 +++++++++++++++++++++++++++ audio/raven/config/mixer_paths.xml | 30 +++++++++++++++++++++++++++ audio/slider/config/mixer_paths.xml | 30 +++++++++++++++++++++++++++ audio/whitefin/config/mixer_paths.xml | 30 +++++++++++++++++++++++++++ 4 files changed, 120 insertions(+) diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index 696b1da..066eed8 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -127,6 +127,15 @@ + + + + + + + + + @@ -171,6 +180,14 @@ + + + + + + + + @@ -534,6 +551,11 @@ + + + + + @@ -558,6 +580,14 @@ + + + + + + + + diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index 696b1da..a94dfd9 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -127,6 +127,15 @@ + + + + + + + + + @@ -173,6 +182,14 @@ + + + + + + + + @@ -534,6 +551,11 @@ + + + + + @@ -558,6 +580,14 @@ + + + + + + + + diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml index ed7c2fe..d2c10f4 100644 --- a/audio/slider/config/mixer_paths.xml +++ b/audio/slider/config/mixer_paths.xml @@ -114,6 +114,15 @@ + + + + + + + + + @@ -137,6 +146,14 @@ + + + + + + + + @@ -498,6 +515,11 @@ + + + + + @@ -522,6 +544,14 @@ + + + + + + + + diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml index ee676eb..86c8a85 100644 --- a/audio/whitefin/config/mixer_paths.xml +++ b/audio/whitefin/config/mixer_paths.xml @@ -128,6 +128,15 @@ + + + + + + + + + @@ -172,6 +181,14 @@ + + + + + + + + @@ -535,6 +552,11 @@ + + + + + @@ -559,6 +581,14 @@ + + + + + + + + From bff2bffb51553c47ceccaeaa27d039577c9b8982 Mon Sep 17 00:00:00 2001 From: YB Chiu Date: Tue, 16 Mar 2021 19:43:58 +0800 Subject: [PATCH 2/5] [MFG_API] [audio] update mixer table for usb headset gain the usb headset gain control change to below playback : tinymix -D 1 "Headset Playback Volume" capture : tinymix -D 1 "Headset Capture Volume" Bug: 182438057 Test: build pass Change-Id: Ie66d0dfdb4975fae772be6a5d6524ad2358c7627 --- audio/oriole/config/mixer_paths_factory.xml | 5 +++++ audio/raven/config/mixer_paths_factory.xml | 5 +++++ audio/slider/config/mixer_paths_factory.xml | 5 +++++ audio/whitefin/config/mixer_paths_factory.xml | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml index 05942f7..ccc078c 100644 --- a/audio/oriole/config/mixer_paths_factory.xml +++ b/audio/oriole/config/mixer_paths_factory.xml @@ -71,6 +71,10 @@ + + + + @@ -191,6 +195,7 @@ + diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml index 05942f7..ccc078c 100644 --- a/audio/raven/config/mixer_paths_factory.xml +++ b/audio/raven/config/mixer_paths_factory.xml @@ -71,6 +71,10 @@ + + + + @@ -191,6 +195,7 @@ + diff --git a/audio/slider/config/mixer_paths_factory.xml b/audio/slider/config/mixer_paths_factory.xml index e35ea23..cad5bd1 100644 --- a/audio/slider/config/mixer_paths_factory.xml +++ b/audio/slider/config/mixer_paths_factory.xml @@ -71,6 +71,10 @@ + + + + @@ -191,6 +195,7 @@ + diff --git a/audio/whitefin/config/mixer_paths_factory.xml b/audio/whitefin/config/mixer_paths_factory.xml index e35ea23..cad5bd1 100644 --- a/audio/whitefin/config/mixer_paths_factory.xml +++ b/audio/whitefin/config/mixer_paths_factory.xml @@ -71,6 +71,10 @@ + + + + @@ -191,6 +195,7 @@ + From f3d8bf6fbed962fa8dd42e66f15dfe5b68de8a4c Mon Sep 17 00:00:00 2001 From: linpeter Date: Wed, 17 Mar 2021 09:27:12 +0800 Subject: [PATCH 3/5] slider/whitefin/oriole/raven: add device-vendor make file Bug: 177140883 Test: Check config is loaded in logs, test brightness. Change-Id: I7f20f9bf7d15a22fb968176400f07e77ab42c633 --- device-oriole.mk | 1 + device-raven.mk | 1 + device-slider.mk | 1 + device-whitefin.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 63d69b8..f19c9a0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -20,6 +20,7 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/oriole/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/oriole/device-vendor-oriole.mk) DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay diff --git a/device-raven.mk b/device-raven.mk index f9f351b..2040ee5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -20,6 +20,7 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/raven/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/raven/device-vendor-raven.mk) DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay diff --git a/device-slider.mk b/device-slider.mk index dd76dc3..1f77af9 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -19,6 +19,7 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/slider/device-vendor-slider.mk) DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay diff --git a/device-whitefin.mk b/device-whitefin.mk index 6e41a36..cd31bf4 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -19,6 +19,7 @@ TARGET_KERNEL_DIR := device/google/raviole-kernel $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) +$(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/whitefin/device-vendor-whitefin.mk) DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay From b71cbeefa2a313e76cc6ea2e332226691d6d68c3 Mon Sep 17 00:00:00 2001 From: linpeter Date: Fri, 19 Feb 2021 18:09:49 +0800 Subject: [PATCH 4/5] Update the adaptive brightness table for oriole/raven Bug: 177143493 test: check brightness table Change-Id: Ic5968a75b676b016024dd317388f83b80a046ed5 --- oriole/overlay/frameworks/base/core/res/res/values/config.xml | 4 +++- raven/overlay/frameworks/base/core/res/res/values/config.xml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 34d3054..5bed6f0 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -136,6 +136,7 @@ 2981 5000 10000 + 20000 327.8974352 401.1676739 - 600.0 + 750.0 + 900.0 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 a110eb6..e734336 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -135,6 +135,7 @@ 2981 5000 10000 + 20000 327.8974352 401.1676739 - 600.0 + 750.0 + 900.0 From 2fe803e23d179d1b40f623da0485c8aef695cf33 Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Wed, 10 Mar 2021 17:15:03 +0800 Subject: [PATCH 5/5] oriole: Launch twoshay during boot Bug: 173330899 Test: twoshay is launched Signed-off-by: Steve Pfetsch Change-Id: I189f32e0fcb6b5880bc188971cc847603aafa4dc Signed-off-by: Tai Kuo --- conf/init.oriole.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc index dd24fe4..8425b5a 100644 --- a/conf/init.oriole.rc +++ b/conf/init.oriole.rc @@ -28,6 +28,9 @@ on fs chown system system /dev/goodix_fp exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app + # Start the twoshay touch service + start twoshay + # Toggle glove_mode according to touch_sensitivity_mode on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1 write /sys/class/spi_master/spi11/spi11.0/glove_mode 00