From 8309254a9911c9b61bd3b32755e8f6c7ec48efa0 Mon Sep 17 00:00:00 2001 From: yixuanjiang Date: Mon, 18 Dec 2023 16:10:27 +0800 Subject: [PATCH 01/11] aoc: update mixer table for voice capture Currently AoC always use 3ch in voice usecase rather than using mic MAX microphone as ch count. We have changed mechanism to mapping pdm mask on voice usecase in AUD_PDM. Modify the mask to map voice request. Bug: 316603846 Signed-off-by: yixuanjiang (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:95a27172c112c785d90b8e05cc8fbeddf796fe25) Merged-In: Idf92d1da0df632c6410d30147725857e55cef70b Change-Id: Idf92d1da0df632c6410d30147725857e55cef70b --- audio/lynx/config/mixer_paths.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/lynx/config/mixer_paths.xml b/audio/lynx/config/mixer_paths.xml index bec5b6e..fa99523 100644 --- a/audio/lynx/config/mixer_paths.xml +++ b/audio/lynx/config/mixer_paths.xml @@ -726,8 +726,8 @@ - - + + @@ -752,8 +752,8 @@ - - + + @@ -778,8 +778,8 @@ - - + + @@ -791,8 +791,8 @@ - - + + From 9a4c234f46ed01423a93f7f2d9bf3d23d3527d76 Mon Sep 17 00:00:00 2001 From: yixuanjiang Date: Mon, 18 Dec 2023 19:53:29 +0800 Subject: [PATCH 02/11] aoc: update mixer table for voice capture V2 Currently AoC always use 3ch in voice usecase rather than using mic MAX microphone as ch count. Modify the mask to map voice request Bug: 316603846 Signed-off-by: yixuanjiang (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a5bb2e6cf0beaa5695383dde9448b6fe58ae357b) Merged-In: Id61e5ab635e612acd9a359578ec8771a1ce00cde Change-Id: Id61e5ab635e612acd9a359578ec8771a1ce00cde --- audio/lynx/config/mixer_paths.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/lynx/config/mixer_paths.xml b/audio/lynx/config/mixer_paths.xml index fa99523..7a84669 100644 --- a/audio/lynx/config/mixer_paths.xml +++ b/audio/lynx/config/mixer_paths.xml @@ -778,8 +778,8 @@ - - + + @@ -791,8 +791,8 @@ - - + + From 91598a53881eec01d040b771ce8b67cd0a7ca7b4 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Fri, 26 Jan 2024 05:51:10 +0000 Subject: [PATCH 03/11] gps: Disable Vzw SUPL OTDOA Bug: 322404137 Test: OTDOA test in b/322404137 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5acf68944dee7b76faa7855fdda998a327e9b640) Merged-In: I9a734fd1e5cad733ab6054c0dabe9388580f5ddb Change-Id: I9a734fd1e5cad733ab6054c0dabe9388580f5ddb --- location/gps.xml.l10 | 2 +- location/gps_user.xml.l10 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/location/gps.xml.l10 b/location/gps.xml.l10 index de21762..8eef797 100644 --- a/location/gps.xml.l10 +++ b/location/gps.xml.l10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10 index 2f131b1..98eef79 100644 --- a/location/gps_user.xml.l10 +++ b/location/gps_user.xml.l10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From a6b7bfe9731814dab3539914a13f5daae4303941 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 02:00:42 +0000 Subject: [PATCH 04/11] Update lynx SVN to 36 Bug: 325156176 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:df4a1ef1d00c0c2ea994b05a6f8cd96dcfdab9b3) Merged-In: I77899d8e0fd2d125b0fec47e84d0e1f55de2ab0d Change-Id: I77899d8e0fd2d125b0fec47e84d0e1f55de2ab0d --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 35b1c5c..a8b464b 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 87e802c5ff7d071057860777050afef611d1017a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 02:02:32 +0000 Subject: [PATCH 05/11] Update lynx SVN to 37 Bug: 325156176 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4b3cdd15f9bd656d96c086b507724dfe1aff3196) Merged-In: I19739180c3e5722f8e64094018f10c3511300541 Change-Id: I19739180c3e5722f8e64094018f10c3511300541 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index a8b464b..10957aa 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=36 + ro.vendor.build.svn=37 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 5f6afc438ea86f3d4267eb524a95814d5bf8afdf Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 02:03:43 +0000 Subject: [PATCH 06/11] Update lynx SVN to 38 Bug: 325156176 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6275a87edb642f6ca7b6841dfd37b5af1d9d4e03) Merged-In: I337a8128a53772cca01fc9da375a0226b2f16ed4 Change-Id: I337a8128a53772cca01fc9da375a0226b2f16ed4 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 10957aa..87d1c28 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=38 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From d587275827257aa126048d62bd3f048bb5ecd0a6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 6 Mar 2024 00:43:12 +0000 Subject: [PATCH 07/11] Update lynx SVN to 39 Bug: 325156176 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a9cb7d8123379ef4e14d091e3afec082f954d75f) Merged-In: I2a7d1e94068fff910a2d970def9a5aed105fff31 Change-Id: I2a7d1e94068fff910a2d970def9a5aed105fff31 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 87d1c28..c916b01 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=38 + ro.vendor.build.svn=39 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 5690a9aa3f565e1365e95df73446cc424bc76a27 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 28 Mar 2024 15:32:59 +0000 Subject: [PATCH 08/11] Update lynx SVN to 40 Bug: 330382848 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a5c102e29a9406780ba0a7c48e23a6eca592d648) Merged-In: If141e1b3fbd821eaa20337d5c92b1f1dc394d601 Change-Id: If141e1b3fbd821eaa20337d5c92b1f1dc394d601 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index c916b01..e24b46a 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=39 + ro.vendor.build.svn=40 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 538397b479faaa10bd04800b9722a873e82afb95 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 3 Apr 2024 23:13:32 +0000 Subject: [PATCH 09/11] Update lynx SVN to 41 Bug: 330382848 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ab5eb3f429e9a8023fc1582c9d8365ff1a42968) Merged-In: Ibf4ddca313b26e8e86831bfb251fa2909957ebb3 Change-Id: Ibf4ddca313b26e8e86831bfb251fa2909957ebb3 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index e24b46a..9f23d53 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 83df3358c32a955df03a87ce85b7e6660e07dcf0 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 24 Apr 2024 23:08:31 +0000 Subject: [PATCH 10/11] Update lynx SVN to 42 Bug: 336526332 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9964e69ea85aa81531441f51fcad5e51384b9825) Merged-In: I156bc0b08e2a53d2b2ac0f5ff14f4505db8c13d8 Change-Id: I156bc0b08e2a53d2b2ac0f5ff14f4505db8c13d8 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 9f23d53..e53de60 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -232,7 +232,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 66ce7551c8d99f87b9caec2f6e8796007509b253 Mon Sep 17 00:00:00 2001 From: Peter Lin Date: Thu, 28 Dec 2023 04:46:40 +0000 Subject: [PATCH 11/11] update educeBrightColorsStrengt setting Bug: 312329951 Test: dumpsys color_display (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed912e19baca340c006468037c98a5b9901a99dc) Merged-In: I278e2814a41b1d42b337de06d1eb50911455f2a3 Change-Id: I278e2814a41b1d42b337de06d1eb50911455f2a3 --- .../frameworks/base/core/res/res/values/config.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lynx/overlay/frameworks/base/core/res/res/values/config.xml b/lynx/overlay/frameworks/base/core/res/res/values/config.xml index 07118d2..8dd1bb9 100644 --- a/lynx/overlay/frameworks/base/core/res/res/values/config.xml +++ b/lynx/overlay/frameworks/base/core/res/res/values/config.xml @@ -32,6 +32,15 @@ 6 + + 35 + + + 25 + + + 50 + 0.0