From 1130f24d79c04d2dfd40ecd48c0b5f27787c65c3 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:51:09 +0800 Subject: [PATCH 1/3] 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:bc19c19239b1e023de5760ec9c44925242d399f1) Merged-In: I7a1ff29ea0f18c2d339091aaec5b723fa7fdbf17 Change-Id: I7a1ff29ea0f18c2d339091aaec5b723fa7fdbf17 --- gps.6.1.xml.b3 | 2 +- gps.xml.b3 | 2 +- gps_user.6.1.xml.b3 | 2 +- gps_user.xml.b3 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3 index 9ab8fc6..555522f 100644 --- a/gps.6.1.xml.b3 +++ b/gps.6.1.xml.b3 @@ -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/gps.xml.b3 b/gps.xml.b3 index 777f50a..ce53e8c 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -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/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3 index 8679528..484dd89 100644 --- a/gps_user.6.1.xml.b3 +++ b/gps_user.6.1.xml.b3 @@ -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/gps_user.xml.b3 b/gps_user.xml.b3 index 7b4ce7a..35e76aa 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -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 5581e8035a3f93bf8dd735047e59d8ca903446fb Mon Sep 17 00:00:00 2001 From: Eileen Lai Date: Sun, 8 Dec 2024 07:38:26 +0000 Subject: [PATCH 2/3] 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: I99b870299241be06858bf4e5210ad991a344ce6a Flag: NONE local testing only --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index e5ae365..475aa04 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -118,7 +118,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 += \ From 7fe286c7e00d5441eca7d43bea03107fd7272556 Mon Sep 17 00:00:00 2001 From: Chungkai Mei Date: Tue, 17 Dec 2024 09:56:36 +0000 Subject: [PATCH 3/3] remove unused hint As we already migrated kernel to 6.1, NewlyIdleBalancer is not used anymore. Flag: NONE just remove unused hint Bug: 379810138 Change-Id: I320983d36c2cc8edae99e5c132ca63f4d2237046 Signed-off-by: Chungkai Mei --- powerhint.json | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/powerhint.json b/powerhint.json index 4fcdb12..147ebbb 100644 --- a/powerhint.json +++ b/powerhint.json @@ -322,14 +322,6 @@ ], "ResetOnInit": true }, - { - "Name": "NewlyIdleBalancer", - "Path": "/proc/vendor_sched/idle_balancer", - "Values": [ - "0", - "1" - ] - }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", @@ -1097,12 +1089,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1199,12 +1185,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1283,12 +1263,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1373,12 +1347,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint",