From 743337bafb03db0c9d90f6b9c31bae92e27e1d65 Mon Sep 17 00:00:00 2001 From: leonardian Date: Tue, 21 May 2024 06:12:06 +0000 Subject: [PATCH 01/23] conf: Enable access for braking time sysfs nodes Sysfs nodes: - braking_time_bank - braking_time_index - braking_time_ms Bug: 325121485 Test: Open sysfs nodes successfully during HAL init Change-Id: Ib1d4a62bf6e0c88c69869a83196c3e9bd003ef47 Signed-off-by: leonardian --- conf/init.bluejay.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index 3c256bc..496d62b 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -40,6 +40,9 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state chown system system /sys/bus/i2c/devices/8-0043/default/num_waves + chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_bank + chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_index + 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/f0_comp_enable From 1cefe6d3ef02dfda675b875bae37f34a146e8629 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 23:36:43 +0000 Subject: [PATCH 02/23] Update bluejay SVN to 63 Bug: 342381152 Change-Id: Idce05f44e685a6558c84e73bb514ce509051d099 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4b990ed..e95b912 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -145,7 +145,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=62 + ro.vendor.build.svn=63 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 4c5d5dbde27bebb6092543f4cf655d029f5f8c60 Mon Sep 17 00:00:00 2001 From: leonardian Date: Wed, 12 Jun 2024 02:51:07 +0000 Subject: [PATCH 03/23] Enable all primitive effects - Remove ro.vendor.vibrator.hal.supported_primitives to support all primitive effects - Set ACTUATOR_MODEL to legacy_zlra_actuator Bug: 342062469 Test: idlcli commands Test: atest PTS, VTS, CTS Test: Checked HAL dumpsys for durations Change-Id: I7215afeae30e9c1f0aa0196caae448dea81c921b --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 2636f8d..ac3ff67 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -232,8 +232,8 @@ PRODUCT_SHIPPING_API_LEVEL := 32 # Vibrator HAL $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 +ACTUATOR_MODEL := legacy_zlra_actuator PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.supported_primitives=243 \ ro.vendor.vibrator.hal.f0.comp.enabled=0 \ ro.vendor.vibrator.hal.redc.comp.enabled=0 \ persist.vendor.vibrator.hal.context.enable=false \ From 0e1f7f452bf2cd28b3e155c18681495f6d5b4e63 Mon Sep 17 00:00:00 2001 From: chenkris Date: Fri, 21 Jun 2024 03:45:29 +0000 Subject: [PATCH 04/23] =?UTF-8?q?Build=20g7=5Ftrusty=5Fnext=20for=20?= =?UTF-8?q?=E2=80=9Cnext=E2=80=9D=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 348542941 Test: build Change-Id: I38ff5c22f814057baf36503180fe7f42d9a22164 --- device-bluejay.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 33cb592..00be01d 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -41,7 +41,11 @@ include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL +ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) +GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next +else GOODIX_CONFIG_BUILD_VERSION := g7_trusty +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) From fa39f73b76ec062dae002a7e5b62917b3af93705 Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 24 Jun 2024 11:19:21 +0000 Subject: [PATCH 05/23] =?UTF-8?q?Revert=20"Build=20g7=5Ftrusty=5Fnext=20fo?= =?UTF-8?q?r=20=E2=80=9Cnext=E2=80=9D=20configuration"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0e1f7f452bf2cd28b3e155c18681495f6d5b4e63. Bug: 348542941 Test: build Change-Id: I2cb5e93529eac7831a6010b0ce83d56e8bec23fc --- device-bluejay.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 00be01d..33cb592 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -41,11 +41,7 @@ include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL -ifneq (,$(filter AP4%,$(RELEASE_PLATFORM_VERSION))) -GOODIX_CONFIG_BUILD_VERSION := g7_trusty_next -else GOODIX_CONFIG_BUILD_VERSION := g7_trusty -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) From 8062f7bc9780e13da8796281d3e5cfcfe22af487 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 10:01:25 +0000 Subject: [PATCH 06/23] 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: Ie31bdd4dee719437fc387f03c2fcf1b36764def2 --- device-bluejay.mk | 18 ++++++-- gps.6.1.xml.b3 | 101 ++++++++++++++++++++++++++++++++++++++++++++ gps_user.6.1.xml.b3 | 101 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 216 insertions(+), 4 deletions(-) create mode 100644 gps.6.1.xml.b3 create mode 100644 gps_user.6.1.xml.b3 diff --git a/device-bluejay.mk b/device-bluejay.mk index 00be01d..742a8b5 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -223,11 +223,21 @@ PRODUCT_PRODUCT_PROPERTIES += \ # GPS xml ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) - PRODUCT_COPY_FILES += \ - device/google/bluejay/gps.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/bluejay/gps.6.1.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/bluejay/gps.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else - PRODUCT_COPY_FILES += \ - device/google/bluejay/gps_user.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) + PRODUCT_COPY_FILES += \ + device/google/bluejay/gps_user.6.1.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/bluejay/gps_user.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # This device is shipped with 32 (Android S V2) diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3 new file mode 100644 index 0000000..18f5e65 --- /dev/null +++ b/gps.6.1.xml.b3 @@ -0,0 +1,101 @@ + + + + + + + + + + diff --git a/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3 new file mode 100644 index 0000000..afa301b --- /dev/null +++ b/gps_user.6.1.xml.b3 @@ -0,0 +1,101 @@ + + + + + + + + + + + From 0bb1e8b00a9540edaa3d898dbdd341ddf19c7d7b Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 3 Apr 2024 20:55:15 +0000 Subject: [PATCH 07/23] bluejay: Use build_flags for SVN Flag: build.RELEASE_SVN_BLUEJAY Bug: 332726030 Change-Id: Icd47852ca9d8cc84c4dca145197eab0e671b596c --- device-bluejay.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 33cb592..0df21e5 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -129,8 +129,15 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/bluejay # Increment the SVN for any official public releases +ifdef RELEASE_SVN_BLUEJAY +TARGET_SVN ?= $(RELEASE_SVN_BLUEJAY) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 63 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=$(TARGET_SVN) # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From de52f797532c0402dc043f4f5af76e8174e48ccc Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Tue, 9 Jul 2024 07:54:15 +0000 Subject: [PATCH 08/23] add device id Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I7a654f27d2a1bfa1f3cfebe06ddcbaa34ded6c16 --- device-bluejay.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index de610c9..6ceb541 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -277,3 +277,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Disable AVF Remote Attestation PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20488 From 02d55c9d682282ed368e86f2c10064523780733d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 13 Jul 2024 00:31:42 +0000 Subject: [PATCH 09/23] Update bluejay SVN to 64 Bug: 352170103 Change-Id: Idcef1730cec758e776380497d78321cceca300bb Flag: EXEMPT bugfix --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 72f7dfe..f779f97 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -133,7 +133,7 @@ ifdef RELEASE_SVN_BLUEJAY TARGET_SVN ?= $(RELEASE_SVN_BLUEJAY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 63 +TARGET_SVN ?= 64 endif PRODUCT_VENDOR_PROPERTIES += \ From f03ef4d6bee8667795ede4b76415066987cc3c4c Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Thu, 18 Jul 2024 11:30:21 +0000 Subject: [PATCH 10/23] Update antenna position coordinates Bug: 353895373 Test: manual Flag: EXEMPT bugfix Change-Id: I56cf138cc3a3e6d23b0ac03e08b493f10279c9c2 --- bluejay/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bluejay/rro_overlays/NfcOverlay/res/values/config.xml b/bluejay/rro_overlays/NfcOverlay/res/values/config.xml index 88f9db8..e793130 100644 --- a/bluejay/rro_overlays/NfcOverlay/res/values/config.xml +++ b/bluejay/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 36 - 83 + 67 true From 8900a083d717fcffd5f0f69a5a4c301f6e40442b Mon Sep 17 00:00:00 2001 From: James Huang Date: Fri, 26 Jul 2024 15:21:43 +0800 Subject: [PATCH 11/23] gps: Enable Beidou measurements only in the US for B3. Bug: 354884462 Test: Field test in the US Change-Id: I78796d5f1ac8ce7b4e3d110e2de1f05f988e4a01 --- gps.xml.b3 | 1 + gps_user.xml.b3 | 1 + 2 files changed, 2 insertions(+) diff --git a/gps.xml.b3 b/gps.xml.b3 index 9ee4e24..0b02145 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -95,6 +95,7 @@ diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index 74a7178..e2d2e8b 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -94,6 +94,7 @@ From 500b7edfe1c3bff4ffec34b38f205f913e2b6531 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 25 Jul 2024 20:37:18 +0000 Subject: [PATCH 12/23] Adpf:bluejay: 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: I3b6e368d974553660e8529fed8b7f813015d5abc --- powerhint.json | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/powerhint.json b/powerhint.json index b2d3388..5fa11a9 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1846,11 +1846,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 @@ -1881,11 +1882,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 @@ -1916,11 +1918,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 d20b564e40fc70a7b0ff8d9d312816a3b10e3f38 Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Fri, 19 Jul 2024 12:35:43 -0700 Subject: [PATCH 13/23] haptics: Update output distortion gain Recommended output distortion gain is 0.29. Bug: 328799172 Test: getprop | grep hapticgenerator Flag: EXEMPT bugfix Change-Id: Ie2715ffa7d72e64bc8388931d5acbd24a204074f --- device-bluejay.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index f779f97..706e215 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -259,6 +259,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 + # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml From 163d02568a481eed61d30c96c539aa1705b248bb Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sat, 6 Apr 2024 00:09:58 +0000 Subject: [PATCH 14/23] bluejay: Add build_flags based properties for SMR/EMR build Flag: build.RELEASE_IS_SMR Flag: build.RELEASE_IS_EMR Flag: build.RELEASE_BASE_OS_BLUEJAY Bug: 155105803 Change-Id: Iaa1152d44cafa8a0c14843ac8eacf27ccb827514 --- device-bluejay.mk | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index f779f97..a4245f7 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -139,6 +139,25 @@ endif PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.build.svn=$(TARGET_SVN) +# Set device family property for SMR +PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.device_family=O6R4B9 + +# Set build properties for SMR builds +ifeq ($(RELEASE_IS_SMR), true) + ifneq (,$(RELEASE_BASE_OS_BLUEJAY)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_BLUEJAY) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_BLUEJAY)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_BLUEJAY) + endif +endif + # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 \ From 052208b44f2cae3197263e078fb8c828b6fd3135 Mon Sep 17 00:00:00 2001 From: samou Date: Tue, 16 Jul 2024 07:52:24 +0000 Subject: [PATCH 15/23] thermal: Remove bcl related tzones Flag: EXEMPT tuning changes Bug: 349935208 Test: Confirm boot Change-Id: I32ba0117863b76bac4e8d0a4713b2e5a7bc2b013 Signed-off-by: samou --- powerhint.json | 12 - thermal_info_config_bluejay.json | 388 ------------------------------- 2 files changed, 400 deletions(-) diff --git a/powerhint.json b/powerhint.json index b2d3388..76461f9 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1584,18 +1584,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_bluejay.json b/thermal_info_config_bluejay.json index 17b0eb0..2e3ae30 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -555,22 +555,6 @@ "PollingDelay":60000, "PassiveDelay":7000 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, { "Name":"battery", "Type":"BATTERY", @@ -587,378 +571,6 @@ "Multiplier":0.001, "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" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"LOW_TEMP_UVLO2", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop2", - "Combination":[ - "battery", - "vdroop2" - ], - "Coefficient":[ - "-5000", - "1200" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 2.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "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" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Hidden":true - }, - { - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - } - ] - }, - { - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - } - ] - }, - { - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Hidden":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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", From a16a9542b4deab7e7b89ac33ea18bb1cf8acc5e8 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 14 Aug 2024 09:04:46 +0000 Subject: [PATCH 16/23] thermal:remove unused state2power value Bug: 355566259 Test: Build test Change-Id: I319d788673ff191fb416dfe0691d8f95d6471886 Signed-off-by: Peter (YM) --- thermal_info_config_bluejay.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json index 17b0eb0..1f4e312 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -980,28 +980,24 @@ "Name":"thermal-cpufreq-0", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["436", "372", "320", "248", "224", "188", "164", "120", "80", "60", "24"], "PowerRail":"S4M_VDD_CPUCL0" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1260", "1074", "904", "730", "594", "476", "374", "314", "240", "200", "162", "130", "94", "60"], "PowerRail":"S3M_VDD_CPUCL1" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["4406", "3874", "3500", "3052", "2704", "2334", "2176", "1864", "1492", "1362", "1116", "908", "756", "594", "478", "388", "178"], "PowerRail":"S2M_VDD_CPUCL2" }, { "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"], "PowerRail":"S2S_VDD_G3D" }, { From 98398289334234e76ddbd3414f17d779c799609b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 22:46:51 +0000 Subject: [PATCH 17/23] Update bluejay SVN to 65 Bug: 352170103 Change-Id: Ibaffcbff22afca909b9219e9dd90ac3e01fed94d Flag: EXEMPT bugfix --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index f779f97..1ba2809 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -133,7 +133,7 @@ ifdef RELEASE_SVN_BLUEJAY TARGET_SVN ?= $(RELEASE_SVN_BLUEJAY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 64 +TARGET_SVN ?= 65 endif PRODUCT_VENDOR_PROPERTIES += \ From 76b6c9aad473cbf592d5c1943c833c2ada46c300 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 16 Aug 2024 06:09:54 +0000 Subject: [PATCH 18/23] thermal: read thermistor temp from sysfs - avoid wrong sensor value reading for thermalHAL Bug: 327327502 Test: Build to boot to home Flag: EXEMPT (bug 337358613) Change-Id: Icaeac539f24f68560852e9822d89c3d552c3d7d0 Signed-off-by: Peter (YM) --- thermal_info_config_bluejay.json | 8 -------- thermal_info_config_charge_bluejay.json | 8 -------- 2 files changed, 16 deletions(-) diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json index 17b0eb0..a09197b 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -21,7 +21,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -39,7 +38,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -55,7 +53,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -71,7 +68,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -87,7 +83,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -112,7 +107,6 @@ "0.0", "0.0" ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -128,7 +122,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -144,7 +137,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, diff --git a/thermal_info_config_charge_bluejay.json b/thermal_info_config_charge_bluejay.json index 2ee436f..f19aa45 100644 --- a/thermal_info_config_charge_bluejay.json +++ b/thermal_info_config_charge_bluejay.json @@ -21,7 +21,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -39,7 +38,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -55,7 +53,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -71,7 +68,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -87,7 +83,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -112,7 +107,6 @@ "0.0", "0.0" ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -128,7 +122,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -144,7 +137,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, From 01b506e228013f223a81fe5aae148c06677ec413 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 12 Aug 2024 17:17:48 +0800 Subject: [PATCH 19/23] gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay Bug: 358041425 Test: verify pass Change-Id: I98f98bcfbdc1a306eca3ce25216a61ed436bcbfa --- gps.6.1.xml.b3 | 1 + gps.xml.b3 | 1 + gps_user.6.1.xml.b3 | 1 + gps_user.xml.b3 | 1 + 4 files changed, 4 insertions(+) diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3 index 18f5e65..7b68fcb 100644 --- a/gps.6.1.xml.b3 +++ b/gps.6.1.xml.b3 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/gps.xml.b3 b/gps.xml.b3 index 9ee4e24..25081c8 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3 index afa301b..fb8c15a 100644 --- a/gps_user.6.1.xml.b3 +++ b/gps_user.6.1.xml.b3 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index 74a7178..8d15786 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" From 7cc108b7b49a8fc046b66251db159f42752fa9b4 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 27 Aug 2024 06:57:59 +0000 Subject: [PATCH 20/23] gps: Re-enable GLO & QZSS in US Test: on-device Bug: 353579502 Change-Id: I2cb913ae5dae4bf62c7b11a98dcc429b186520c9 --- gps.6.1.xml.b3 | 3 +++ gps.xml.b3 | 3 +++ gps_user.6.1.xml.b3 | 2 ++ gps_user.xml.b3 | 2 ++ 4 files changed, 10 insertions(+) diff --git a/gps.6.1.xml.b3 b/gps.6.1.xml.b3 index 7b68fcb..9ab8fc6 100644 --- a/gps.6.1.xml.b3 +++ b/gps.6.1.xml.b3 @@ -57,6 +57,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" @@ -95,6 +96,8 @@ /> diff --git a/gps.xml.b3 b/gps.xml.b3 index 25081c8..11c0734 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -57,6 +57,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" @@ -95,6 +96,8 @@ /> diff --git a/gps_user.6.1.xml.b3 b/gps_user.6.1.xml.b3 index fb8c15a..8679528 100644 --- a/gps_user.6.1.xml.b3 +++ b/gps_user.6.1.xml.b3 @@ -94,6 +94,8 @@ /> diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index 8d15786..d677aef 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -94,6 +94,8 @@ /> From 1eb4d583af80f24d6aca71bdc61c68a3f87f157d Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:32:25 +0000 Subject: [PATCH 21/23] Symlink current prebuilt folder to android root The Android are now based on Trunk Stable world and Pixel prebuilts CLs also needs to reply with this which controlled by the flag which results: - the flag value might be different on each branches - the flag value are mostly different on each release configuration - for local builds, ENGs' needs to figure out the correct location of current prebuilts by checking through entire prebuilt textproto files To alleviate this problem, create an symlink file under android root indicates current prebuilt path after invoke the android lunch cmd. Bug: 364831620 Flag: EXEMPT export current prebuilt path Change-Id: I1d77e050f607ac93fe45c9ba075c35274e1052f7 Signed-off-by: Robin Peng --- bluejay/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 6496ad0..bb3ab52 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -43,6 +43,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/bluejay/proprietary/BoardConfigVendor.mk $(call soong_config_set,google3a_config,target_device,bluejay) From c787f48091ce3a2dd64f00dc858f915747fe7933 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:20:33 +0000 Subject: [PATCH 22/23] Update product id for bluejay Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I403b2eea2dbf170209157aba3b44945b3fff9bc8 --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 079bd7b..7c70b6e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -309,5 +309,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Bluejay: 0x4108 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20488 + bluetooth.device_id.product_id=16648 From 1130f24d79c04d2dfd40ecd48c0b5f27787c65c3 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:51:09 +0800 Subject: [PATCH 23/23] 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"