From 4cc605a9ba95028af185e00c39eb5c4592b78d9c Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 17 Feb 2023 15:02:53 -0800 Subject: [PATCH 01/47] dck: add SE capability property Bug: 229777047 Test: boot cheetah; check logs to see that SE property is used Change-Id: Ie6eaa03fa56da7516d5d2aa09cf411ef4de6b02f Signed-off-by: Jeffrey Carlyle --- device-lynx.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index fecef7a..1bb26bf 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -180,7 +180,8 @@ endif # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=2 + ro.gms.dck.eligible_wcc=2 \ + ro.gms.dck.se_capability=1 # WIFI COEX PRODUCT_COPY_FILES += \ From 9d25d84fcc5b1bfdd53a064ac5b52e742c3f354c Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 28 Mar 2023 14:58:12 +0900 Subject: [PATCH 02/47] Add hardware/qcom/wlan namespace With libwifi-hal-qcom migrated to Android.bp with soong namespace the namespace should be added to PRODUCT_SOONG_NAMESPACES as well. Bug: 273376293 Test: m droid Change-Id: I6fe0e5ce62982493c9ef58b1ce651f6b44d37a1b --- device-lynx.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index a09d040..99ae566 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -179,6 +179,9 @@ else device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf endif +# Wifi HAL +PRODUCT_SOONG_NAMESPACES += hardware/qcom/wlan/wcn6740 + # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 \ From c7140feb260301f9336ad339559989172ec0f27b Mon Sep 17 00:00:00 2001 From: chenkris Date: Thu, 8 Jun 2023 09:54:02 +0000 Subject: [PATCH 03/47] Move goodix mk files from device/google/gs101 to vendor/goodix/udfps Bug: 270657514 Test: build Change-Id: I8d9829fd521451e1260e8a6a4de92c515cbda6d0 --- device-lynx.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/device-lynx.mk b/device-lynx.mk index a7f968a..be75b31 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -145,11 +145,11 @@ include device/google/lynx/bluetooth/qti_default.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk +include vendor/goodix/udfps/configuration/udfps_common.mk ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +include vendor/goodix/udfps/configuration/udfps_shipping.mk else -include device/google/gs101/fingerprint/udfps_factory.mk +include vendor/goodix/udfps/configuration/udfps_factory.mk endif # Vibrator HAL From b4a305f96c699fbfa67badb61855b6467609246b Mon Sep 17 00:00:00 2001 From: chenkris Date: Tue, 13 Jun 2023 03:12:45 +0000 Subject: [PATCH 04/47] udfps: fix BB on git_master-without-vendor Bug: 286774587 Test: Build Change-Id: I4b5d31774cc4a3f461c9ac30b4c75db761c26060 --- device-lynx.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/device-lynx.mk b/device-lynx.mk index be75b31..4d46580 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -145,11 +145,11 @@ include device/google/lynx/bluetooth/qti_default.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include vendor/goodix/udfps/configuration/udfps_common.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include vendor/goodix/udfps/configuration/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include vendor/goodix/udfps/configuration/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # Vibrator HAL From d37d551b86e9e10e84626d6cad36683290368a07 Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Wed, 27 Sep 2023 08:57:56 +0000 Subject: [PATCH 05/47] add mixer path for BLE Bug: 302270637 Test: manual Change-Id: I7729a0ad3ad4a1cd8df1eef11b0e1cab5eeacbc9 Signed-off-by: Yung Ti Su --- audio/lynx/aidl_config/mixer_paths_aidl.xml | 92 +++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/audio/lynx/aidl_config/mixer_paths_aidl.xml b/audio/lynx/aidl_config/mixer_paths_aidl.xml index 2628227..3b04d67 100644 --- a/audio/lynx/aidl_config/mixer_paths_aidl.xml +++ b/audio/lynx/aidl_config/mixer_paths_aidl.xml @@ -404,6 +404,14 @@ + + + + + + + + @@ -464,6 +472,14 @@ + + + + + + + + @@ -524,6 +540,14 @@ + + + + + + + + @@ -589,6 +613,14 @@ + + + + + + + + @@ -649,6 +681,14 @@ + + + + + + + + @@ -721,6 +761,14 @@ + + + + + + + + @@ -831,6 +879,14 @@ + + + + + + + + @@ -865,6 +921,14 @@ + + + + + + + + @@ -889,6 +953,10 @@ + + + + @@ -913,6 +981,10 @@ + + + + @@ -947,6 +1019,14 @@ + + + + + + + + @@ -987,6 +1067,10 @@ + + + + @@ -1051,6 +1135,10 @@ + + + + @@ -1220,6 +1308,10 @@ + + + + From ce1d10ea9911034336545f900b5d5d5efb003f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 28 Sep 2023 00:29:47 +0000 Subject: [PATCH 06/47] OWNERS: master -> main Change-Id: Ifacd07d48d59ab56d0b254e76b589c5cd2baa5f1 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 79003ba..7eed0c3 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS From 771547b88e03c964c56e530fc1fc7c58c6b36fcb Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:18 +0000 Subject: [PATCH 07/47] Update lynx SVN to 20 Bug: 302612466 Change-Id: I3929cc8f47075a22d47c580a1ebc3acdef5ee589 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 5b34744..5667008 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=19 + ro.vendor.build.svn=20 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 86a5650a25561789b4b1805c164caed193d112e6 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:48 +0000 Subject: [PATCH 08/47] Update lynx SVN to 21 Bug: 302612466 Change-Id: Id418cfb0934077258b796552b0ff376ca8dde30e --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 5667008..9002502 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 8bfa084300854694e251fd710bd53865d8cd9211 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Mon, 18 Sep 2023 10:19:12 +0800 Subject: [PATCH 09/47] powerhint: Add DISPLAY_CHANGE hint Add DISPLAY_CHANGE hint for display layout change due to rotation or switching between inner and outer panels. Bug: 298150450 Test: build pass Change-Id: Ic36b8b9928e9cdffce3697b5eb12cb586dcc5d7d --- powerhint.json | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/powerhint.json b/powerhint.json index 9ce84eb..d25f105 100644 --- a/powerhint.json +++ b/powerhint.json @@ -725,6 +725,60 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "764" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUMinFreq", From ce379ef8db9a1515f26facad9cb8f123b7a79257 Mon Sep 17 00:00:00 2001 From: ClintChen Date: Mon, 2 Oct 2023 07:58:32 +0000 Subject: [PATCH 10/47] L10: Enable build flag versioning for radio and bootloader Bug: 301142125 Change-Id: I70f8c92d82f0e3779855460f67f3d98b74a65827 --- lynx/BoardConfig.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index ca5006a..732bf94 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -17,6 +17,9 @@ TARGET_BOARD_INFO_FILE := device/google/lynx/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := lynx +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_DIR) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_LYNX_BOOTLOADER_DIR) + ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else From 432bf495196d827367317955e289b1ebcc4ee9d6 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 4 Oct 2023 04:00:37 +0800 Subject: [PATCH 11/47] Add support 48_2 capability for LE audio HW offload Bug: 300788009 Test: manual test in UPF Change-Id: Ic1153cffb3e11b3d6ca1e07935246267d225ae88 --- bluetooth/le_audio_codec_capabilities.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index d4404a8..e1b2d25 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -32,6 +32,9 @@ + + + @@ -62,6 +65,9 @@ + + + @@ -73,6 +79,7 @@ + From be320b794bd96c1658953922d5ddef61c0825962 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 9 Oct 2023 19:56:29 +0000 Subject: [PATCH 12/47] lynx: Replace NFC app with NFC apex Bug: 303286040 Test: Compiles (cherry picked from https://android-review.googlesource.com/q/commit:fffaec7ae48ecf28aaeb7679d831f32d0c0e3889) Merged-In: Id85d62a10589765dffa293770bca9d0906eb2973 Change-Id: Id85d62a10589765dffa293770bca9d0906eb2973 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index b15509a..5f1061c 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -78,7 +78,7 @@ PRODUCT_COPY_FILES += \ device/google/lynx/nfc/libnfc-nci-lynx.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st From f43795206a4aaf86e1bd3902c52c7acae7654aae Mon Sep 17 00:00:00 2001 From: guibing Date: Wed, 2 Aug 2023 18:17:15 +0000 Subject: [PATCH 13/47] powerhint: lynx: update vendor_sched procfs paths Vendor sched procfs path hierarchy gets updated in kernel. Update the paths in powerhint json file to match the change. Bug: 289151587 Test: UIbench ab test. Change-Id: I9b4ac68990cd720deac7d933f1b2fc25e406cc40 --- powerhint.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/powerhint.json b/powerhint.json index d25f105..363727d 100644 --- a/powerhint.json +++ b/powerhint.json @@ -158,7 +158,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "764", "0" @@ -167,7 +167,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "764", "1" @@ -176,7 +176,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -185,7 +185,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -204,7 +204,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -250,7 +250,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -259,7 +259,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -268,7 +268,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -278,7 +278,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -614,7 +614,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" From cd9198f5b959ef0b606e00de4c002a96e93c81fe Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 11 Oct 2023 15:47:55 +0800 Subject: [PATCH 14/47] Use classic connection by default with LE audio device for L10 Bug: 300012501 Test: manual Change-Id: I1cb9b47009995b7e316813d173060265c3c611f7 --- bluetooth/qti_default.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 5da4e3b..63fa314 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -52,6 +52,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/lynx/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio use classic connection by default +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio.le_audio_connection_by_default=false + # Bluetooth HAL and Pixel extension DEVICE_MANIFEST_FILE += \ device/google/lynx/bluetooth/manifest_bluetooth.xml From 71af0a7d9a4e32b15f41c7aec500232d9bec498f Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Fri, 20 Oct 2023 03:49:14 +0000 Subject: [PATCH 15/47] gps: Enable Vzw SUPL OTDOA Bug: 303401506 Test: OTDOA test in b/303401506 Change-Id: I6bfe726c02dd672a7cffbe1ed97e6c719f5d6688 --- 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 4feeafd..a4a45ae 100644 --- a/location/gps.xml.l10 +++ b/location/gps.xml.l10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10 index 142675c..01b4277 100644 --- a/location/gps_user.xml.l10 +++ b/location/gps_user.xml.l10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From f924e4d528099672b35f810b25a378a2e7439b86 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 20 Oct 2023 11:44:24 -0700 Subject: [PATCH 16/47] thermal: align the setting VSKIN related sensors Bug: 302435949 Test: emul_temp Change-Id: I3e2b993f48d2d0b3315c636d1f3e646a3d738056 --- thermal_info_config_lynx.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index a72d137..74a20eb 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -137,8 +137,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -153,8 +153,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 47.0, 52.0, 55.0], "HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -214,8 +214,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 47, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -277,8 +277,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -359,8 +359,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-1", "VIRTUAL-QUT-SKIN2-USB-USB2-2", "VIRTUAL-QUT-SKIN2-USB-GNSS-3", "VIRTUAL-NEU-QUT-SKIN1-SKIN2-USB-USB2-GNSS-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, From 3a0d94f0d0b2de25d43de4ab48e76e43c04c0c14 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:18 +0000 Subject: [PATCH 17/47] Update lynx SVN to 20 Bug: 302612466 Change-Id: I3929cc8f47075a22d47c580a1ebc3acdef5ee589 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 6872a80..a70a8d7 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=19 + ro.vendor.build.svn=20 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 02c0ddcf511b8177fcef205a9c030976c76ef260 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:48 +0000 Subject: [PATCH 18/47] Update lynx SVN to 21 Bug: 302612466 Change-Id: Id418cfb0934077258b796552b0ff376ca8dde30e --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index a70a8d7..4e574e5 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 738a0e9359bdc221c4a223873cff53cb13e8e34f Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 20:27:01 +0000 Subject: [PATCH 19/47] Adding Fast Pair extended IDs for L10 Adding the Fast Pair extended IDs for lynx so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: TBD Change-Id: I3d4492e007de0b25f6f4af37917e798861d48a77 --- device-lynx.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index 9002502..4ddc3e2 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -283,3 +283,8 @@ PRODUCT_PACKAGES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=lynx From 126e54a429eadbc2b63370aca5f1908b5f74a55a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:21:33 +0000 Subject: [PATCH 20/47] Update lynx SVN to 22 Bug: 302612466 Change-Id: Ib3ccc703aba169eba719121c42cbc248d7d5d477 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 4ddc3e2..b9f60a9 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=21 + ro.vendor.build.svn=22 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 6141679fa5deb3408877a334a8fc07e63f874640 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Mon, 23 Oct 2023 21:28:29 +0800 Subject: [PATCH 21/47] Split bootloader prebuilt to 24Q1 and trunk version Bug: 299879102 Change-Id: Ieaea8397a0c81c5c6d78613a2a08376b7d71f4db --- device-lynx.mk | 10 ++++++++++ lynx/BoardConfig.mk | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index f4d87f4..cb40007 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -146,6 +146,11 @@ include device/google/lynx/bluetooth/qti_default.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/trunk +endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -167,6 +172,11 @@ PRODUCT_VENDOR_PROPERTIES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/trunk +endif # GPS xml ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index 732bf94..92ac058 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -18,7 +18,11 @@ TARGET_BOARD_INFO_FILE := device/google/lynx/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := lynx RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_LYNX_BOOTLOADER_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk From ae5df6c5a3228f450189be167ef1203477db950b Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 25 Oct 2023 17:02:34 -0600 Subject: [PATCH 22/47] Fix lunch choices for git_main We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: I7b31c905be1d994de52652162c0bd2bc8c5b8c65 --- AndroidProducts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index c6046a3..ac458ed 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -20,4 +20,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/factory_lynx.mk COMMON_LUNCH_CHOICES := \ - aosp_lynx-userdebug + aosp_lynx-trunk_staging-userdebug From 138db44373c01c4c1e7e8c829a44937dde42730b Mon Sep 17 00:00:00 2001 From: Will Song Date: Fri, 27 Oct 2023 17:55:33 +0000 Subject: [PATCH 23/47] PREUPLOAD: Enforce jsonlint in preupload Checks syntax and simple brace balances for all JSON files. Test: Edit any json file and try upload Bug: 127794899 Change-Id: I59436ef5456f9826fe9d2dc76107d65194939418 --- PREUPLOAD.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 PREUPLOAD.cfg diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..37ebb5e --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Builtin Hooks] +jsonlint = true From ff1256f40c38332ccd169b8b72497337bd6fa347 Mon Sep 17 00:00:00 2001 From: gilliu Date: Thu, 26 Oct 2023 07:01:33 +0000 Subject: [PATCH 24/47] display : update make file for display_golden_cal0.pb Bug: 299028202 Test: Check libdisplaycolor log Change-Id: Ic611aa019bf4a9c1058815bc60ae1221aab3bcd9 --- device-lynx.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 14fd063..65265a0 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -58,7 +58,9 @@ PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=33 # Display Config PRODUCT_COPY_FILES += \ - device/google/lynx/lynx/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb + device/google/lynx/lynx/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \ + device/google/lynx/lynx/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb + # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 From b1df77943111252c347eab44e1c55158384328aa Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 14:58:26 +0000 Subject: [PATCH 25/47] Revert "lynx: Replace NFC app with NFC apex" Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056 Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056 Bug: 309117462 Change-Id: If440c4bcad742af7c6d597eac9e45ce4d56453a4 Test: Compiles, device boots up --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 65265a0..52c21a5 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -80,7 +80,7 @@ PRODUCT_COPY_FILES += \ device/google/lynx/nfc/libnfc-nci-lynx.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayLynx From b8729b4c8c4cd02b13a4456355a5b4cfc88eefa8 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 19:04:46 +0000 Subject: [PATCH 26/47] Revert "lynx(nfc): Modify NFC overlays for NFC apex" Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://android-review.googlesource.com/q/commit:68ca561dc4c9b9bdc3fef431c82957f4f1e86f46) Merged-In: Icd19426cf13ab0b1092de4dc1abf79b850d04f3f Change-Id: Icd19426cf13ab0b1092de4dc1abf79b850d04f3f --- device-lynx.mk | 3 +-- .../packages/apps/Nfc}/res/values/config.xml | 0 rro_overlays/NfcOverlay/Android.bp | 9 ------- rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ------------------- rro_overlays/NfcOverlay/OWNERS | 2 -- 5 files changed, 1 insertion(+), 40 deletions(-) rename {rro_overlays/NfcOverlay => lynx/overlay/packages/apps/Nfc}/res/values/config.xml (100%) delete mode 100644 rro_overlays/NfcOverlay/Android.bp delete mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 rro_overlays/NfcOverlay/OWNERS diff --git a/device-lynx.mk b/device-lynx.mk index 52c21a5..78bbd6d 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -82,8 +82,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayLynx + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/lynx/overlay/packages/apps/Nfc/res/values/config.xml similarity index 100% rename from rro_overlays/NfcOverlay/res/values/config.xml rename to lynx/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index 0b3fcb6..0000000 --- a/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_lynx_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayLynx", - sdk_version: "current", - product_specific: true -} diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS From 22016f30e0062f9c269ac7fc7be854fe5394802a Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 24 Oct 2023 03:25:23 +0000 Subject: [PATCH 27/47] [USB AIDL] Remove USB configuration from audio_platform_configuration.xml These configs are hardcoded into audio HAL instead because it's very rarely changed. Bug: 307439907 Test: Local Test. Change-Id: I519a59ef19e880f3e33687c779de6a8bdbcfe733 --- .../lynx/aidl_config/audio_platform_configuration.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/audio/lynx/aidl_config/audio_platform_configuration.xml b/audio/lynx/aidl_config/audio_platform_configuration.xml index 35c059d..4d95392 100644 --- a/audio/lynx/aidl_config/audio_platform_configuration.xml +++ b/audio/lynx/aidl_config/audio_platform_configuration.xml @@ -46,15 +46,7 @@ - - - - - - - - - + From b7613b64d956296125345f8a219261aa1bf89bac Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:19:44 +0000 Subject: [PATCH 28/47] Update lynx SVN to 23 Bug: 302612466 Change-Id: I06ff3d93eb0bfd675ad63d0b074f2c4a4da7ff21 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index b9f60a9..a863d3d 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=22 + ro.vendor.build.svn=23 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 13f56384a88aac163dc647bbccb0b8726d37c9a6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:28:35 +0000 Subject: [PATCH 29/47] Update lynx SVN to 24 Bug: 309529736 Change-Id: Id02da96e176692058b6075f35e29dcdda92e3367 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index a863d3d..055cf25 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=23 + ro.vendor.build.svn=24 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From ff345904afab785ebc8c5810629136903276e142 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Mon, 13 Nov 2023 14:10:21 +0800 Subject: [PATCH 30/47] Remove Phase 1 property setting Bug: 310092817 Test: manual test Change-Id: Idef0c805959266e5ebd3c20e9e524f9f2e923be4 --- bluetooth/qti_default.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 63fa314..5e902bf 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -44,10 +44,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=false -# LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default) -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.toggle_visible=false - # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ device/google/lynx/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml From 24c5451e23065adc0eb1d61c63048b711923e674 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 14 Nov 2023 03:57:21 +0000 Subject: [PATCH 31/47] Update lynx SVN to 25 Bug: 309529736 Change-Id: I2c65f3c6a9488a96d3793ee505a3d91fd6ed1762 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 055cf25..af4ba99 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=24 + ro.vendor.build.svn=25 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 8b07e4935a9e17bb7aa97a5c266cd8db6940cd05 Mon Sep 17 00:00:00 2001 From: "Becker (Chan-Ying) Lien" Date: Thu, 16 Nov 2023 03:01:17 +0000 Subject: [PATCH 32/47] Update ShannonIms CERTIFICATE to PRESIGNED for Lynx Bug: 311289519 Change-Id: I75460e4a840bb319b6a00442fde3f14f52f574d0 --- self-extractors/google_devices/staging/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk index a720400..92948df 100644 --- a/self-extractors/google_devices/staging/Android.mk +++ b/self-extractors/google_devices/staging/Android.mk @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE From 7f719af997a67e522aa400b36db05128d248b8dd Mon Sep 17 00:00:00 2001 From: "Becker (Chan-Ying) Lien" Date: Thu, 16 Nov 2023 03:01:17 +0000 Subject: [PATCH 33/47] Update ShannonIms CERTIFICATE to PRESIGNED for Lynx Bug: 311289519 Change-Id: I75460e4a840bb319b6a00442fde3f14f52f574d0 --- self-extractors/google_devices/staging/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk index a720400..92948df 100644 --- a/self-extractors/google_devices/staging/Android.mk +++ b/self-extractors/google_devices/staging/Android.mk @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE From d4d4d10e79b7e6c2d8ff420352a8561868ce20ef Mon Sep 17 00:00:00 2001 From: Austin Delgado Date: Mon, 13 Nov 2023 11:33:44 -0800 Subject: [PATCH 34/47] Update L10 bounding box to 14x14mm Bug: 310264815 Test: N/A Change-Id: Ia5840860f583502148b80db57731c4c6ee93c6a8 --- lynx/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 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..ac1fff2 100644 --- a/lynx/overlay/frameworks/base/core/res/res/values/config.xml +++ b/lynx/overlay/frameworks/base/core/res/res/values/config.xml @@ -313,4 +313,7 @@ true + + + 6 From c482b9ebac27ad758878590daa45fb3fabbd56a7 Mon Sep 17 00:00:00 2001 From: Shin-Yu Wang Date: Mon, 30 Oct 2023 13:44:29 +0000 Subject: [PATCH 35/47] Update idle timer setting Bug: 308140165 Test: check result of `adb shell getprop ro.surface_flinger.set_idle_timer_ms` Change-Id: Ibe64e8b53b3cf9ac87e67eb1cc5ad997b41a80fc --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 123758c..b85804e 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -63,7 +63,7 @@ PRODUCT_COPY_FILES += \ # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true #config of primary display frames to reach LHBM peak brightness From 4f9468f55841db7f6154cdc9d5dcb939f5ab196b Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Sat, 25 Nov 2023 21:59:59 +0000 Subject: [PATCH 36/47] Revert "Remove Phase 1 property setting" This reverts commit ff345904afab785ebc8c5810629136903276e142. Reason for revert: b/313215812 Bug: 313215812 Change-Id: Id370b4d7289635be7154afe5dd8f5d3db71947ff --- bluetooth/qti_default.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 5e902bf..63fa314 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -44,6 +44,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=false +# LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default) +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.toggle_visible=false + # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ device/google/lynx/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml From bcbc47f9b62759490514f563db329dd28f885765 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:31:05 +0000 Subject: [PATCH 37/47] Update lynx SVN to 26 Bug: 313696499 Change-Id: I59c0060571e481d7d79a25237e17ddc921e542bb --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index af4ba99..75cb82d 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=25 + ro.vendor.build.svn=26 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f364e86d290de47c18f9020fd88901ea2ed77f5c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:32:59 +0000 Subject: [PATCH 38/47] Update lynx SVN to 27 Bug: 313696499 Change-Id: I62ae585f1fdf41f58c1d0db85cd445afe37eae7a --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 75cb82d..038e01a 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=26 + ro.vendor.build.svn=27 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From ecb5502fcdcc26a1fedd776c0b368357acf6c615 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 39/47] Revert^2 "lynx: Replace NFC app with NFC apex" b1df77943111252c347eab44e1c55158384328aa Bug: 303286040 Test: Compiles Change-Id: I9ae126ca8228c293bb7a88bed645528db3e0642b --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 95c4b8f..8dd29c7 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -80,7 +80,7 @@ PRODUCT_COPY_FILES += \ device/google/lynx/nfc/libnfc-nci-lynx.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From 1d9b0c8f2664145ee69894624f5223a7ee6c8bee Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 40/47] Revert^2 "lynx(nfc): Modify NFC overlays for NFC apex" b8729b4c8c4cd02b13a4456355a5b4cfc88eefa8 Bug: 303286040 Test: Compiles Change-Id: I8078db2061a83f4ebac2e46c1cec96e3c363b225 --- device-lynx.mk | 3 +- rro_overlays/NfcOverlay/Android.bp | 9 +++++ rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ rro_overlays/NfcOverlay/OWNERS | 2 ++ rro_overlays/NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 rro_overlays/NfcOverlay/Android.bp create mode 100644 rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 rro_overlays/NfcOverlay/OWNERS create mode 100644 rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-lynx.mk b/device-lynx.mk index 8dd29c7..c33f733 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -82,7 +82,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayLynx # SecureElement PRODUCT_PACKAGES += \ diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..0b3fcb6 --- /dev/null +++ b/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_lynx_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayLynx", + sdk_version: "current", + product_specific: true +} diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..4a8efa9 --- /dev/null +++ b/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + + G0DZQ + GWKK3 + GHL1X + G82U8 + + true + + 70 + 150 + false + + 36 + + + 102 + + From 7b14f3da28f6599093021ece94ca48413bc71b8e Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 11 Sep 2023 20:55:32 -0700 Subject: [PATCH 41/47] powerhint: add game mode tuning nodes Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes. Test: check sysfs when playing game Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cdf834206df344a704f7f6f21e503f0e3abd4bbb) Merged-In: Iae9629e0f69d437f7444022d81a478d0c12f2bbe Change-Id: Iae9629e0f69d437f7444022d81a478d0c12f2bbe --- powerhint.json | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index 363727d..ef1bb23 100644 --- a/powerhint.json +++ b/powerhint.json @@ -61,6 +61,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -89,6 +99,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -117,6 +137,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -141,11 +171,22 @@ "Path": "/proc/vendor_sched/dvfs_headroom", "Values": [ "1280", + "1100", "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -300,7 +341,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", From 2d460b2afc361d1fa94a023f3a43668a4e5c3fe0 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 11 Sep 2023 20:56:18 -0700 Subject: [PATCH 42/47] powerhint: game mode tuning Test: test build Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:00d94318d492669c6c132d702ee73ccd515fa5bf) Merged-In: Ie1c7672d9950630ee868538e49937580d3aece4d Change-Id: Ie1c7672d9950630ee868538e49937580d3aece4d --- powerhint.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/powerhint.json b/powerhint.json index ef1bb23..d3e8692 100644 --- a/powerhint.json +++ b/powerhint.json @@ -701,6 +701,36 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1703,6 +1733,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", From 51ed1712ef9737d5e70e7e6ec163fdbcabec5d98 Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 7 Nov 2023 07:05:23 +0000 Subject: [PATCH 43/47] [CCA] Set enable flag by default on Lynx. Bug: 309566086 Test: N/A Change-Id: I7df613093377dec59d2ed6f7858ef49afedf85b4 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index c33f733..d707c2f 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -281,7 +281,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ ##Audio Vendor property PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.cca.enabled=true + persist.vendor.audio.cca.enabled=false # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 8fd96082864572553e8d76055e418a61600c6cfb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:48:54 +0000 Subject: [PATCH 44/47] Update lynx SVN to 28 Bug: 313797924 Change-Id: I1b62f6f6e86128428f8855641d334a87ff90e587 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 038e01a..97fbeb7 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 43b710269005523817f0f70697d17288affa645f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:49:49 +0000 Subject: [PATCH 45/47] Update lynx SVN to 29 Bug: 313797924 Change-Id: I2c42209ecd64e0c6ec73bbb2e795756281a635f2 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 97fbeb7..1d16cd0 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=28 + ro.vendor.build.svn=29 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 61c2524f0b686fe2cfcf0fe845e87892a60c5c49 Mon Sep 17 00:00:00 2001 From: David Chen Date: Tue, 12 Dec 2023 02:11:54 +0000 Subject: [PATCH 46/47] Add zoom boost in powerhint for L10 This patch is meant to reduce frame drop rate in 60FPS video recording with zoom in/out. The boost will be triggered at 60FPS video recording while zoom ratio change (for each request that contain zoom ratio control in metadata), and will last for 15 frames. Test: gca_smoke_test Bug: 315102326 Change-Id: I7f0587881c131590f629dab838aa734a8b082c70 --- powerhint.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/powerhint.json b/powerhint.json index d3e8692..5e344c2 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1036,6 +1036,18 @@ "Duration": 1000, "Value": "664000" }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", From 201e0d7659bc9a62ea8c89e8a48db446b4afa6a8 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 16:18:10 +0800 Subject: [PATCH 47/47] Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: Ib50aa8fb3dc2f55b60fe55d1f4a906846846a396 --- device-lynx.mk | 4 ++++ lynx/BoardConfig.mk | 2 ++ 2 files changed, 6 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index 0d49f86..a7edbde 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -150,6 +150,8 @@ include device/google/lynx/bluetooth/qti_default.mk GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/trunk endif @@ -176,6 +178,8 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/trunk endif diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index 92ac058..fa7407f 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -20,6 +20,8 @@ TARGET_BOOTLOADER_BOARD_NAME := lynx RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_LYNX_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif