From eb703190ba947a7e911571ffa5738f330d2eadf2 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:58:14 +0800 Subject: [PATCH 1/8] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1ff2576bfed678e262fa82fc236d9cf95cd11860) Merged-In: I9590c44abb8cc1a2334ad4c882683db277662ef0 Change-Id: I9590c44abb8cc1a2334ad4c882683db277662ef0 --- location/gps.6.1.xml.c10 | 2 +- location/gps.6.1.xml.p10 | 2 +- location/gps.xml | 2 +- location/gps.xml.c10 | 2 +- location/gps.xml.p10 | 2 +- location/gps_user.6.1.xml.c10 | 2 +- location/gps_user.6.1.xml.p10 | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.c10 | 2 +- location/gps_user.xml.p10 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 index d582845..a5ac7c3 100644 --- a/location/gps.6.1.xml.c10 +++ b/location/gps.6.1.xml.c10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10 index d132bfa..62841e5 100644 --- a/location/gps.6.1.xml.p10 +++ b/location/gps.6.1.xml.p10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml b/location/gps.xml index e091ba3..d50202c 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index 58356f4..7b1da4c 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 643c2ef..5e92649 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.c10 b/location/gps_user.6.1.xml.c10 index 2aa6fc4..f51614d 100644 --- a/location/gps_user.6.1.xml.c10 +++ b/location/gps_user.6.1.xml.c10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.p10 b/location/gps_user.6.1.xml.p10 index ebbc2f7..5fd9163 100644 --- a/location/gps_user.6.1.xml.p10 +++ b/location/gps_user.6.1.xml.p10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 463f991..1658c49 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 2f573bf..a48c8b0 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index 1198001..bdfa5c1 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" From 4258e9174ffb8222cdf724b49debc907b5476f71 Mon Sep 17 00:00:00 2001 From: Isaac Chiou Date: Fri, 1 Nov 2024 07:12:38 +0000 Subject: [PATCH 2/8] Disable Wifi BugReport for subsystem restart Flag: EXEMPT gated by overlay Bug: 373594936 Test: Manuel test, trigger SSR and won't create bugreport automatically Change-Id: I09c7abe0a1ce0d5eada4bc7c9b02d329954da1c8 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 2 ++ panther/rro_overlays/WifiOverlay/res/values/config.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index d80000b..9525293 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -179,4 +179,6 @@ false: firmware roaming will not be affected. --> true + + false diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 23d08d3..00d26c8 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -179,4 +179,6 @@ false: firmware roaming will not be affected. --> true + + false From 05b6cbe100f9a9e3a298a2a76be4f8245f70cc1c Mon Sep 17 00:00:00 2001 From: Barry Date: Mon, 25 Nov 2024 02:20:46 +0000 Subject: [PATCH 3/8] Update P22 Bluetooth LEA unicast allowlist: Samsung Galaxy Buds 3 pro Add Samsung Galaxy Buds 3 pro into unicast default allowlist. bug: 380370088 Test: PTE PQM-BT LE audio unicast test Flag: EXEMPT The Samsung Galaxy Buds 3 pro users are able to disable LE audio in Settings app Change-Id: I807492d3c54a44797bcc9aafdc6185e9ed0eb1bf --- device-cheetah.mk | 2 +- device-panther.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 34276c3..3d3989a 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -244,7 +244,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-panther.mk b/device-panther.mk index 2d92c63..91fe564 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -214,7 +214,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ From 6606b836c58b9b180811d2ea4bc3ca909a7c74a6 Mon Sep 17 00:00:00 2001 From: Zouberou Sayibou Date: Sun, 1 Dec 2024 04:43:53 +0000 Subject: [PATCH 4/8] pantah/haptics: Remove voltage restriction for haptics Remove the voltage restriction for haptics since DVL is enabled. This will allow FW control for exertion protection of the motor, and allow for stronger output for audio-haptics. Bug: 318476589 Flag: EXEMPT config json change Test: dumpsys vibrator_manager and accel measurement Change-Id: I8f4b8ed97056bb678e4191a87d6c12832a1c3926 Signed-off-by: Zouberou Sayibou --- cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- panther/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index 392c5ec..d578c7b 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -180,9 +180,6 @@ com.google.sensor.quick_pickup - - 0.335 - 2 3 diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index 014f57a..1526dc4 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -202,9 +202,6 @@ com.google.sensor.quick_pickup - - 0.335 - 2 3 From 2eb5220301b18807bb074c98466f920c6ffbcdd2 Mon Sep 17 00:00:00 2001 From: Zouberou Sayibou Date: Tue, 3 Dec 2024 02:47:11 +0000 Subject: [PATCH 5/8] Revert "pantah/haptics: Remove voltage restriction for haptics" Revert submission 30661505-tdm_amplitude_limitation_removal_dvl Reason for revert: short time to properly test before 25q1 cut-off. Reverted changes: /q/submissionid:30661505-tdm_amplitude_limitation_removal_dvl Bug: 318476589 Change-Id: If7eab4922ef59e7c23624ca8b1454c8d09569544 --- cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ panther/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index d578c7b..392c5ec 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -180,6 +180,9 @@ com.google.sensor.quick_pickup + + 0.335 + 2 3 diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index 1526dc4..014f57a 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -202,6 +202,9 @@ com.google.sensor.quick_pickup + + 0.335 + 2 3 From 6f0b32823ad4bf7c08ed57a7e6bd442d0b8f2c56 Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Sun, 8 Dec 2024 07:39:32 +0000 Subject: [PATCH 6/8] modem_svc: use modem_svc_sit version sepolicy For solving sepolicy conflicts for different AP version, modem_svc_sit will support devices from gs101 to zuma_pro. Bug: 372400955 Change-Id: I640f6ddf7d744e5edb6d48b209b95d1dd0ad6eb1 Flag: NONE local testing only --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- factory_ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3d3989a..67dde2d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -138,7 +138,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 151f1db..2c02475 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -87,7 +87,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index 91fe564..d4e660b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -117,7 +117,7 @@ PRODUCT_PACKAGES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk # SecureElement PRODUCT_PACKAGES += \ diff --git a/factory_ravenclaw.mk b/factory_ravenclaw.mk index f11f738..9028a9d 100644 --- a/factory_ravenclaw.mk +++ b/factory_ravenclaw.mk @@ -34,4 +34,4 @@ PRODUCT_PROPERTY_OVERRIDES += \ SHARED_MODEM_PLATFORM_VENDOR := lassen # Shared Modem Platform -include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk +include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk From 978853810095aa32f17c0b9d7fe8e15d8e8bd8a2 Mon Sep 17 00:00:00 2001 From: Nathan Kulczak Date: Wed, 11 Sep 2024 00:44:30 +0000 Subject: [PATCH 7/8] Vibrator: Add permissions for owt_lib_compat Add permissions to access owt_lib_compat sysfs attribute Bug: 346570576 Flag: vendor.vibrator.hal.flags.enable_pwle_v2 Test: Flash to device and use access sysfs Change-Id: Ic86d17458f0c97b1a1a91fbfcf718fc8d4d6d7ba Signed-off-by: Nathan Kulczak --- conf/init.pantah.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index a404bb5..1603ef6 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -88,6 +88,7 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_ms chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/8-0043/default/owt_lib_compat chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us From 640c3160c9b39d6b7d986fbc325bcb4fde049044 Mon Sep 17 00:00:00 2001 From: Tommy Chang Date: Fri, 27 Dec 2024 10:37:20 +0000 Subject: [PATCH 8/8] Disable Bluetooth Hearing Access Profile default enable for P22 Set bluetooth.profile.hap.enabled_by_default to false bug: 386323913 Test: m Flag: EXEMPT, properties change only for feature config Change-Id: I1f7898f9fedefff9b64cbb51b5fbb177b87d57e4 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 67dde2d..30a8fc4 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -246,6 +246,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 +# Disable Bluetooth HAP by default +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.hap.enabled_by_default=false + # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.ble.allow_enc_with_bredr=true diff --git a/device-panther.mk b/device-panther.mk index d4e660b..e10429a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -216,6 +216,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 +# Disable Bluetooth HAP by default +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.profile.hap.enabled_by_default=false + # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.ble.allow_enc_with_bredr=true