From 7fe5d802379e0a87abcdaaab90f00ddf20bfecef Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 09:55:13 +0000 Subject: [PATCH 01/17] gps: Set configuration by kernel version Bug: 258364350 Test: Verification at b/258364350. Test: Function verification at b/258364350. Test: Compile and verify the configuration is correct. Change-Id: I4dfdc8d65a3a407db3b66aae1a5f05fc0cd226c5 --- device-lynx.mk | 26 ++++++--- location/gps.6.1.xml.l10 | 102 ++++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.l10 | 102 ++++++++++++++++++++++++++++++++++ 3 files changed, 223 insertions(+), 7 deletions(-) create mode 100644 location/gps.6.1.xml.l10 create mode 100644 location/gps_user.6.1.xml.l10 diff --git a/device-lynx.mk b/device-lynx.mk index ba03d52..76b4a20 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -173,17 +173,29 @@ PRODUCT_VENDOR_PROPERTIES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts -# GPS xml +# Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/lynx/location/lhd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/lynx/location/scd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/lynx/location/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/lynx/location/lhd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/lynx/location/scd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/lynx/location/gps.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/lynx/location/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/lynx/location/gps_user.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Wifi HAL diff --git a/location/gps.6.1.xml.l10 b/location/gps.6.1.xml.l10 new file mode 100644 index 0000000..33aa2be --- /dev/null +++ b/location/gps.6.1.xml.l10 @@ -0,0 +1,102 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.l10 b/location/gps_user.6.1.xml.l10 new file mode 100644 index 0000000..833b204 --- /dev/null +++ b/location/gps_user.6.1.xml.l10 @@ -0,0 +1,102 @@ + + + + + + + + + + + From 55450c3eb56ccaec0c7942aaa279bd2cb9c70752 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Tue, 9 Jul 2024 07:37:09 +0000 Subject: [PATCH 02/17] add device id Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I05d65e301ac34abab623784c9e9ed2a773c29a0c --- device-lynx.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index 76b4a20..1509e75 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -309,3 +309,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.oem_id=00e0 \ ro.quick_start.device_id=lynx + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20491 From 22efb793b7f40f1953a80ff10a81ee2709b1defb Mon Sep 17 00:00:00 2001 From: Vic Huang Date: Wed, 10 Jul 2024 08:20:00 +0000 Subject: [PATCH 03/17] Disable LE audio switcher in develop option Test: manually test pass Bug: 352241698 Flag: NONE Modify property to disable LE audio switcher Change-Id: I666ea8e21070eeda761263957db767eaa970a1b3 --- bluetooth/qti_default.mk | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk index 7d26e5f..f696ce1 100644 --- a/bluetooth/qti_default.mk +++ b/bluetooth/qti_default.mk @@ -23,38 +23,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth LE Audio PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_switcher.supported=true \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=false \ - ro.vendor.audio_hal.ble_use_stream_id=true \ - bluetooth.profile.bap.unicast.client.enabled?=true \ - bluetooth.profile.csip.set_coordinator.enabled?=true \ - bluetooth.profile.hap.client.enabled?=true \ - bluetooth.profile.mcp.server.enabled?=true \ - bluetooth.profile.ccp.server.enabled?=true \ - bluetooth.profile.vcp.controller.enabled?=true \ - -# Bluetooth LE Audio CIS handover to SCO -# Set the property only if the controller doesn't support CIS and SCO -# simultaneously. More details in b/242908683. -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.notify.idle.during.call=true - -# Not support LE Audio dual mic SWB call based on the current launch strategy -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 - -# LE Audio use classic connection by default -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio.le_audio_connection_by_default=false + ro.bluetooth.leaudio_switcher.supported=false \ + bluetooth.profile.bap.unicast.client.enabled?=false \ + bluetooth.profile.csip.set_coordinator.enabled?=false \ + bluetooth.profile.hap.client.enabled?=false \ + bluetooth.profile.mcp.server.enabled?=false \ + bluetooth.profile.ccp.server.enabled?=false \ + bluetooth.profile.vcp.controller.enabled?=false \ # Bluetotoh Auto On feature PRODUCT_PRODUCT_PROPERTIES += \ From a6d2650cbf619521a78364321a84489ec7acdae4 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:11:05 +0000 Subject: [PATCH 04/17] lynx: Use build_flags for SVN Flag: build.RELEASE_SVN_LYNX Bug: 332726030 Change-Id: Id2c31d9b6b8db9d7948a7a1174be141e3b913171 --- device-lynx.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 1509e75..1c36d85 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -223,8 +223,15 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g # Increment the SVN for any official public releases +ifdef RELEASE_SVN_LYNX +TARGET_SVN ?= $(RELEASE_SVN_LYNX) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 44 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=44 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 9fccabdd0801d3bb89a075c8ec2b04aaa66935d7 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Fri, 12 Jul 2024 02:31:29 +0000 Subject: [PATCH 05/17] audio: Phase in L10 fortemedia tuning tables Change List : Fortemedia: Enable kid voice detection for voice call. Files from the latest attachment on b/352640073 Bug: 352640073 Test: verified by ntkuo@ Flag: EXEMPT update audio table only. Change-Id: I301a5052a90495b09eb8d8b2624fa4d60f1b5d03 --- audio/lynx/tuning/fortemedia/BLUETOOTH.dat | Bin 276978 -> 276978 bytes audio/lynx/tuning/fortemedia/BLUETOOTH.mods | 18 ++-- audio/lynx/tuning/fortemedia/HANDSET.dat | Bin 255674 -> 255674 bytes audio/lynx/tuning/fortemedia/HANDSET.mods | 98 ++++++++++---------- audio/lynx/tuning/fortemedia/HANDSFREE.dat | Bin 117198 -> 117198 bytes audio/lynx/tuning/fortemedia/HANDSFREE.mods | 42 ++++----- audio/lynx/tuning/fortemedia/HEADSET.dat | Bin 426106 -> 426106 bytes audio/lynx/tuning/fortemedia/HEADSET.mods | 34 +++---- 8 files changed, 96 insertions(+), 96 deletions(-) diff --git a/audio/lynx/tuning/fortemedia/BLUETOOTH.dat b/audio/lynx/tuning/fortemedia/BLUETOOTH.dat index 4c6db731be30844f990f774b111a8487f32a7430..0a5b2455cfefb1d8eba815ffa6e2f46a53913245 100644 GIT binary patch delta 99 zcmezLS>V%WfemRKY$*&pObh~(9aV%WfemRKlZ$Sw*v!ZIMPvG-I>xn|*BiYDv$kyRTE9eL@;*(T=~)6SJe&Dy aPZ)w!Y-#RV-`=&J5r~<#cdcj6=mG$Ia3jtD diff --git a/audio/lynx/tuning/fortemedia/BLUETOOTH.mods b/audio/lynx/tuning/fortemedia/BLUETOOTH.mods index 594c59b..3b3baaa 100644 --- a/audio/lynx/tuning/fortemedia/BLUETOOTH.mods +++ b/audio/lynx/tuning/fortemedia/BLUETOOTH.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG BLUETOOTH #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2023-08-15 15:10:51 +#SAVE_TIME 2024-07-04 16:09:14 #CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -533,8 +533,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -3202,8 +3202,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -5871,8 +5871,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -11209,8 +11209,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH diff --git a/audio/lynx/tuning/fortemedia/HANDSET.dat b/audio/lynx/tuning/fortemedia/HANDSET.dat index fc4375eee30649468da370f63b6a650e16268481..62a57cc2268e9fb9c6d7c221aacdd92daa083ad9 100644 GIT binary patch delta 511 zcmdmWmVeh-{tamyY$*&pObi0sCsZ&!V%zM;zeNcuGTEVZ+2(adA2eVp3XU=ZRkS6+ zRcv->ou&zuoetE$YIEEAH!$U3?Q%Ea+Clv7yO-I`^JTPvIRvC` z@;W1)?f*g;u5gJlSaG}c0!C+S>J}@0vmb(A| delta 511 zcmdmWmVeh-{tamyYzz!MObiU$CsZ&!V%zM;zeNcuGTEVZ+2(adA2eVp3XU=ZRkS6+ zRcv->ou&zuoetE$YIEEAH!$U3?Q%Ea+Clv7yO-I`^JTPvIRvC` z@;W1)?f*g;u5gJlSaG}c0!C+S>J}_&Hi`xJI diff --git a/audio/lynx/tuning/fortemedia/HANDSET.mods b/audio/lynx/tuning/fortemedia/HANDSET.mods index f9b336a..d076005 100644 --- a/audio/lynx/tuning/fortemedia/HANDSET.mods +++ b/audio/lynx/tuning/fortemedia/HANDSET.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSET #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2024-05-21 10:42:17 +#SAVE_TIME 2024-07-04 16:04:34 #CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -533,8 +533,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x6000 //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -3202,8 +3202,8 @@ 521 0x0000 //TX_GSC_RTOL_TH 522 0x0000 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -5871,8 +5871,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -8540,8 +8540,8 @@ 521 0x7FFF //TX_GSC_RTOL_TH 522 0x7FFF //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -11209,8 +11209,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x6000 //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -13878,8 +13878,8 @@ 521 0x0000 //TX_GSC_RTOL_TH 522 0x0000 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -16547,8 +16547,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -19216,8 +19216,8 @@ 521 0x7FFF //TX_GSC_RTOL_TH 522 0x7FFF //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -21885,8 +21885,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -24554,8 +24554,8 @@ 521 0x7FFF //TX_GSC_RTOL_TH 522 0x7FFF //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -27223,8 +27223,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -29892,8 +29892,8 @@ 521 0x7FFF //TX_GSC_RTOL_TH 522 0x7FFF //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -32561,8 +32561,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -35230,8 +35230,8 @@ 521 0x7FFF //TX_GSC_RTOL_TH 522 0x7FFF //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -37899,8 +37899,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -40568,8 +40568,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x6000 //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -43237,8 +43237,8 @@ 521 0x0000 //TX_GSC_RTOL_TH 522 0x0000 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -45906,8 +45906,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -48575,8 +48575,8 @@ 521 0x7FFF //TX_GSC_RTOL_TH 522 0x7FFF //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -51244,8 +51244,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x6000 //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -53913,8 +53913,8 @@ 521 0x0000 //TX_GSC_RTOL_TH 522 0x0000 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -56582,8 +56582,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -59251,8 +59251,8 @@ 521 0x7FFF //TX_GSC_RTOL_TH 522 0x7FFF //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -61920,8 +61920,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH diff --git a/audio/lynx/tuning/fortemedia/HANDSFREE.dat b/audio/lynx/tuning/fortemedia/HANDSFREE.dat index cdc79dcf00703a0af6332d9885599c7c4d46c21b..4a3d3a90df9c0a3b53642d46060efce68ec6c697 100644 GIT binary patch delta 136 zcmX>%nf=^k_6=zq)9Y3+uGq}S`9%Z7TDy6@(R+>UK-NpP&Fx8>l|X`9Hot3q0hYeA z{S^~qt-@yg3(jDTTeipPFfLWteEKJZ50*awRtlCv(Y1Yk86#BN D1a&^f delta 190 zcmX>%nf=^k_6=zqYzz!MObiT@9avK}{d diff --git a/audio/lynx/tuning/fortemedia/HANDSFREE.mods b/audio/lynx/tuning/fortemedia/HANDSFREE.mods index 3521b0d..da74211 100644 --- a/audio/lynx/tuning/fortemedia/HANDSFREE.mods +++ b/audio/lynx/tuning/fortemedia/HANDSFREE.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSFREE #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2023-08-15 15:10:19 +#SAVE_TIME 2024-07-04 16:04:55 #CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -533,8 +533,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -3202,8 +3202,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -5871,8 +5871,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -8540,8 +8540,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -11209,8 +11209,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -13878,8 +13878,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -16547,8 +16547,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -19216,8 +19216,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -21885,8 +21885,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH @@ -24554,8 +24554,8 @@ 521 0x3A98 //TX_GSC_RTOL_TH 522 0x3A98 //TX_GSC_RTOH_TH 523 0x7E2C //TX_WIDE2_MEANHTH -524 0x0000 //TX_DR_RESRV_5 -525 0x0000 //TX_DR_RESRV_6 +524 0x0064 //TX_DR_RESRV_5 +525 0x1000 //TX_DR_RESRV_6 526 0x122E //TX_DR_RESRV_7 527 0x1100 //TX_DR_RESRV_8 528 0x1333 //TX_WIND_MARK_TH diff --git a/audio/lynx/tuning/fortemedia/HEADSET.dat b/audio/lynx/tuning/fortemedia/HEADSET.dat index b31b4490c10f0abb289baf075d207d4b50a7bc1c..6f983cf798989285ca32b84e3818cefa098b083b 100644 GIT binary patch delta 244 zcmey>AoZ(3s$mOb-3qo81|B8`f$0+}n3iq#lVq`B+Z=WO4b%3%L#!?0)A?kXc&7i# zWaioa?j)lQ2UPKPg-eXnG+~?v*({IPw$Ec?3h+S{I@QWpAT_=2FcZ&as|!y#+RZDO zwwqTnXU|8s^MeLVBhX-=S!$jvTa;izK;w;qkvKt$)9qqed8TIxu<&fpa$pwW-`*w9 d0<;Jux*h0N1%8kLP=WS!#;n`d8MB@70RYEsObq}4 delta 229 zcmey>AoZ(3s$mOb-HPdDQ(0DQ_mX6BVA~vZ{|(djzC)}n;?wzLnRurE%4Fu*{_Z5B z4hKlp+U>8MSghH$+r4BhkOC{%UiX>N0xY*>dtVNV3ETF0OiTejAjL3&Q>~0Z#dU|7 zcs5&Ic*@akUdgoGyplP4KHT0f8gRqkgPCBhEkSTomMBcOi)H1Ro+ZG-vpvg!S%iOk gmplv5RFLR)pc@tVx2t)=1lrdbvu Date: Thu, 18 Jul 2024 11:19:29 +0000 Subject: [PATCH 06/17] Update antenna position coordinates Bug: 353895373 Test: manual Flag: EXEMPT bugfix Change-Id: I1f2b151dc5d9bfae976ea0e8501f6f7159e6b805 --- rro_overlays/NfcOverlay/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml index 5c54b76..70fe660 100644 --- a/rro_overlays/NfcOverlay/res/values/config.xml +++ b/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 36 - 102 + 48 true From 89ddd0be8396f992edc0305e71ba087bb8d91a7f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:15:22 +0000 Subject: [PATCH 07/17] Update lynx SVN to 45 Bug: 352170103 Change-Id: I9ae3af899655057a07488fee2e085cd1884fcca0 Flag: EXEMPT bugfix --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 1c36d85..eeb3fbd 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -227,7 +227,7 @@ ifdef RELEASE_SVN_LYNX TARGET_SVN ?= $(RELEASE_SVN_LYNX) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 44 +TARGET_SVN ?= 45 endif PRODUCT_VENDOR_PROPERTIES += \ From 81bbf6f29c280db866d733c709422755230348d5 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:03:04 +0000 Subject: [PATCH 08/17] Update lynx SVN to 44 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f24e16e5fb1e9bb0b62903081fe3498ac257f823) Merged-In: I6be0c030e892e41624d6ca3cdaf2f1d8b505711b Change-Id: I6be0c030e892e41624d6ca3cdaf2f1d8b505711b --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 75d7787..42f303c 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -212,7 +212,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=43 + ro.vendor.build.svn=44 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 21b611d4ce08bb8767f70e5e991fbf5a0b78f979 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:11:05 +0000 Subject: [PATCH 09/17] lynx: Use build_flags for SVN Flag: build.RELEASE_SVN_LYNX Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a6d2650cbf619521a78364321a84489ec7acdae4) Merged-In: Id2c31d9b6b8db9d7948a7a1174be141e3b913171 Change-Id: Id2c31d9b6b8db9d7948a7a1174be141e3b913171 --- device-lynx.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index 42f303c..f34337d 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -211,8 +211,15 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g # Increment the SVN for any official public releases +ifdef RELEASE_SVN_LYNX +TARGET_SVN ?= $(RELEASE_SVN_LYNX) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 44 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=44 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4e54c82f402d134130c44315483b09f87eab0c96 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 14:15:22 +0000 Subject: [PATCH 10/17] Update lynx SVN to 45 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:89ddd0be8396f992edc0305e71ba087bb8d91a7f) Merged-In: I9ae3af899655057a07488fee2e085cd1884fcca0 Change-Id: I9ae3af899655057a07488fee2e085cd1884fcca0 --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index f34337d..172506a 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -215,7 +215,7 @@ ifdef RELEASE_SVN_LYNX TARGET_SVN ?= $(RELEASE_SVN_LYNX) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 44 +TARGET_SVN ?= 45 endif PRODUCT_VENDOR_PROPERTIES += \ From 415a0f80b51fea967b719a05ea1c529c5b5e46fc Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 25 Jul 2024 20:14:53 +0000 Subject: [PATCH 11/17] Adpf:lynx: switch to multitier heuristic boost. Bug: 344685639 Test: Checked the trace file running on the device. Flag: NONE powerhal doesn't have a flag yet Change-Id: I8f21008a15f1805d6b193e56cdd8ba5146270e90 --- powerhint.json | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/powerhint.json b/powerhint.json index 223109b..9cf8e49 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1989,11 +1989,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -2024,11 +2025,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -2059,11 +2061,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 From ed80b9345a9aee1ab846f4f6b599dd57e111c47d Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Fri, 19 Jul 2024 12:33:37 -0700 Subject: [PATCH 12/17] haptics: Update output distortion gain Recommended output distortion gain is 0.29. Bug: 328799172 Test: getprop | grep hapticgenerator Flag: EXEMPT bugfix Change-Id: I784c7933e63fce0dfe84ab76400e913e5b0567e1 --- device-lynx.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index eeb3fbd..423ce66 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -170,6 +170,10 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ persist.vendor.vibrator.hal.context.settlingtime=5000 +# Override Output Distortion Gain +PRODUCT_VENDOR_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.29 + # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts From 77bda630a9df1528e5d222d0487b425584db29ef Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 19 Apr 2024 20:45:52 +0000 Subject: [PATCH 13/17] lynx: Add build_flags based properties for SMR/EMR build Flag: build.RELEASE_IS_SMR Flag: build.RELEASE_IS_EMR Flag: build.RELEASE_BASE_OS_LYNX Bug: 155105803 Change-Id: I3c2d4586accdab96292d2a45b9835b3f49f4255b --- device-lynx.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/device-lynx.mk b/device-lynx.mk index 423ce66..f7175a3 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -237,6 +237,24 @@ endif PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.build.svn=$(TARGET_SVN) +# Set device family property for SMR +PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.device_family=P10C10L10 + +# Set build properties for SMR builds +ifeq ($(RELEASE_IS_SMR), true) + ifneq (,$(RELEASE_BASE_OS_LYNX)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_LYNX) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_LYNX)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_LYNX) + endif +endif # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ ro.support_hide_display_cutout=true From a738769119bb921fbede0981e765d30dd763394d Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 9 Aug 2024 08:33:46 +0000 Subject: [PATCH 14/17] update OWNERS to include Android.bp Flag: EXEMPT only changing OWNERS Bug: 357036384 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3cfbc79e7334559e92e8a84efeb887bfa4db8507) Merged-In: I17ef95789dd4b53738e47424f38ff74f335fa4eb Change-Id: I17ef95789dd4b53738e47424f38ff74f335fa4eb --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 5524a1f..b511997 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:main:/MK_OWNERS +per-file *.mk,*/BoardConfig.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS From e79b7cdacc10a8ab7cd26d0ac85f135da6ed557d Mon Sep 17 00:00:00 2001 From: samou Date: Tue, 23 Jul 2024 13:29:16 +0000 Subject: [PATCH 15/17] thermal: Remove bcl related tzones Flag: EXEMPT tuning changes Bug: 349935208 Test: Confirm boot Change-Id: I613fbb3d170f6befeaf8c884bce4b5455729ba2e Signed-off-by: samou --- powerhint.json | 12 -- thermal_info_config_lynx.json | 283 ---------------------------------- 2 files changed, 295 deletions(-) diff --git a/powerhint.json b/powerhint.json index 9cf8e49..7434a2b 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1721,18 +1721,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index 88877cc..7cd0c80 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -453,289 +453,6 @@ "Type":"NPU", "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001 - }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"], - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"], - "Multiplier":1, - "Monitor":true - }, - { - "Name":"BCL_TPU_LOW_TEMP", - "Type":"BCL_CURRENT", - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "TriggerSensor": "ocp_tpu", - "Combination":["ocp_tpu", "battery"], - "Coefficient":[1, -10], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], - "Multiplier":1, - "Monitor":true, - "PassiveDelay":500, - "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - } - ] - }, - { - "Name":"BCL_GPU_LOW_TEMP", - "Type":"BCL_CURRENT", - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "TriggerSensor": "ocp_gpu", - "Combination":["ocp_gpu", "battery"], - "Coefficient":[1, -10], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 13000, "NAN", "NAN"], - "Multiplier":1, - "Monitor":true, - "PassiveDelay":500, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 11, 11, 11] - } - ] - }, - { - "Name":"BCL_BATOILO_GPU_LOW_TEMP", - "Type":"BCL_CURRENT", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "batoilo", - "Combination":["batoilo", "ocp_gpu", "battery"], - "Coefficient":[5000, 12000, -1000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], - "Multiplier":1, - "Monitor":true, - "PassiveDelay":500, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 11, 11, 11] - } - ] - }, - { - "Name":"BCL_BATOILO_TPU_LOW_TEMP", - "Type":"BCL_CURRENT", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "batoilo", - "Combination":["batoilo", "ocp_tpu", "battery"], - "Coefficient":[5000, 12000, -1000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.0, "NAN", "NAN"], - "Multiplier":1, - "Monitor":true, - "PassiveDelay":500, - "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - } - ] - }, - { - "Name":"BCL_BATOILO_GPU", - "Type":"BCL_CURRENT", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "batoilo", - "Combination":["batoilo", "ocp_gpu"], - "Coefficient":[5000, 12000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], - "Multiplier":1, - "Monitor":true, - "PassiveDelay":500, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - } - ] - }, - { - "Name":"BCL_BATOILO_TPU", - "Type":"BCL_CURRENT", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "batoilo", - "Combination":[ - "batoilo", - "ocp_tpu" - ], - "Coefficient":[5000, 12000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], - "Multiplier":1, - "Monitor":true, - "PassiveDelay":500, - "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - } - ] - }, - { - "Name":"BCL_AUDIO_BAACL", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "soc", - "Combination":["battery", "soc"], - "Coefficient":[-25000, 80], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], - "Multiplier":1, - "Monitor":true - }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 2, 2, 2] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true } ], "CoolingDevices":[ From 2b25b1e02e499cce393560c003a6e1e0a9eb4de8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:05:18 +0000 Subject: [PATCH 16/17] Update lynx SVN to 46 Bug: 352170103 Change-Id: Ib31e9c68c0849c7affc5b4410ea2226e9ff9126b Flag: EXEMPT bugfix --- device-lynx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-lynx.mk b/device-lynx.mk index f7175a3..d38fa58 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -231,7 +231,7 @@ ifdef RELEASE_SVN_LYNX TARGET_SVN ?= $(RELEASE_SVN_LYNX) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 45 +TARGET_SVN ?= 46 endif PRODUCT_VENDOR_PROPERTIES += \ From c51835291448791fd44a7fe34d0def1070fca5c3 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 14 Aug 2024 08:57:41 +0000 Subject: [PATCH 17/17] thermal:remove unused state2power value Bug: 355566259 Test: Build test Flag: EXEMPT NDK Change-Id: Ib92c4f0c9474a43a8e0e181b3ddd58d14bd8cea3 Signed-off-by: Peter (YM) --- thermal_info_config_lynx.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index 7cd0c80..22e6874 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -459,26 +459,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":[1100, 1050, 1000, 950, 900, 850, 800, 750, 700, 650, 600] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":[1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":[1450, 1400, 1350, 1300, 1250, 1200, 1150, 1100, 1050, 1000, 950, 900, 850, 800, 750] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":[4599, 3727, 3259, 2378, 2044, 1813, 1449, 1223, 1007, 804, 633, 452] + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { "Name":"fcc",