From 1c928aa82f8adad5cdebd8c39ac059b60ffeeea5 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Mon, 29 Apr 2024 08:44:08 +0000 Subject: [PATCH 1/4] Add system property for concurrent encryption on LE and BR/EDR Bug: 330704060 Change-Id: I31f8bcb49359473d52474231b6e777c62109ae51 Merged-In: I31f8bcb49359473d52474231b6e777c62109ae51 Test: make (cherry picked from commit 7e0d85ec533f433f49350105196ac140969d1a3d) --- device-comet.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-comet.mk b/device-comet.mk index 3c63153..723e34e 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -190,6 +190,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.hfp.swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # POF PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.finder.supported=true From f8e414dbd811926ca3655da25b3f8ff4c721cf84 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Mon, 6 May 2024 16:21:26 +0800 Subject: [PATCH 2/4] thermal: Support undersampling for vskin-models Enable undersampling for VSkin-Model adn VSkin-Speaker-Model, this will enable to avoid unnecesary read temp fails when enough samples not collected. Bug: 338920071 Test: Push config and verify for thermal error logs Change-Id: Ic8af11170c0273286068c12493615c4b838ecacc --- thermal/thermal_info_config_comet.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 3d2fac6..956c4c6 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -233,7 +233,8 @@ "Formula": "USE_ML_MODEL", "Combination":["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm", "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"], "Multiplier":0.001, - "PreviousSampleCount": 3 + "PreviousSampleCount": 3, + "SupportUnderSampling": true }, { "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", @@ -876,7 +877,8 @@ "Formula": "USE_ML_MODEL", "Combination": ["soc_therm", "rffe_therm", "charger_therm", "usb_conn_therm", "modem_therm", "inner_display_therm", "display_therm", "gnss_tcxo_therm", "maxfg_base", "maxfg_secondary", "inner_brightness"], "Multiplier": 0.001, - "PreviousSampleCount": 3 + "PreviousSampleCount": 3, + "SupportUnderSampling": true }, { "Name": "VIRTUAL-SKIN-SPEAKER-MODEL-LEGACY-DIFF", From 2051f6e8e17ff98e47d6f27993129eedd25cd8b6 Mon Sep 17 00:00:00 2001 From: Weizhung Ding Date: Mon, 6 May 2024 11:29:08 +0000 Subject: [PATCH 3/4] display: low-light blocking zone support Bug: 320804821 Test: dumpsys SurfaceFlinger|grep blocking Change-Id: I995cbe1e1bb05d2e3ff5e85d7395e6ec1a9eec16 --- device-comet.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-comet.mk b/device-comet.mk index 450b9b7..fb63c12 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -77,6 +77,7 @@ PRODUCT_COPY_FILES += \ ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),) PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=20:120,30:60,:1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000 endif From 94639beacfbe09037863f8381e9d02e717ab8e6b Mon Sep 17 00:00:00 2001 From: Yen-Chao Chen Date: Tue, 7 May 2024 11:04:03 +0800 Subject: [PATCH 4/4] remove syna touch dump Because we added the touch reset at the end of gti touch dump, it's possible making conflict between touch resetting and syna touch dump. As all the information from the syna touch dump is already covered by the gti touch dump, remove the syna touch dump to avoid conflict. Bug: 338935477 Test: trigger bugreport and there is no error in the log. Change-Id: Ib408a70bb0d5121c027959d423a114954d777c58 Signed-off-by: Yen-Chao Chen --- device-comet.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device-comet.mk b/device-comet.mk index 1875f70..d694769 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -47,7 +47,6 @@ include device/google/zumapro/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/predump_gti_dual.mk -include device/google/gs-common/touch/syna/predump_syna19.mk include device/google/gs-common/display/dump_second_display.mk # go/lyric-soong-variables