From c58b2daccaa7f26d6b18392dae83de68ee4de7b6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 30 May 2024 00:00:55 +0000 Subject: [PATCH 01/33] Update panther SVN to 59 Bug: 342381152 Change-Id: Idd25f5c1fa8da8a7bb045dac0a81f267ecbb556d --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 2ba1948..091ce97 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=59 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 6afe8e8885f071bb13d3c2d644cff5f1c940f58f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 23:40:20 +0000 Subject: [PATCH 02/33] Update cheetah SVN to 59 Bug: 342381152 Change-Id: I6ccef90e6b26a686c825b25be1b3b9bbacc80cba --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 895dd8f..bb3e030 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -323,7 +323,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=59 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From f71ccb22fcfe3d9ed2c038460fd50f5563872e20 Mon Sep 17 00:00:00 2001 From: leonardian Date: Fri, 17 May 2024 12:09:28 +0000 Subject: [PATCH 03/33] 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: Ibe803ee2aad73d0fa50666678a12955828c99167 Signed-off-by: leonardian --- conf/init.pantah.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 6c8ec43..7fe3687 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -83,6 +83,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 62e36545385a6b59427a2ac316838b50b821ef15 Mon Sep 17 00:00:00 2001 From: chenkris Date: Fri, 21 Jun 2024 04:00:44 +0000 Subject: [PATCH 04/33] =?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: Iffea2d1d1450680d1206455eb1579ff99028be28 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index bb3e030..bf4bd53 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -283,7 +283,11 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/pantah # 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) diff --git a/device-panther.mk b/device-panther.mk index 091ce97..b4573aa 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -262,7 +262,11 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/pantah # 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 8acd5f5452e503436c135e979c045f6ca00098f6 Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 24 Jun 2024 05:20:08 +0000 Subject: [PATCH 05/33] =?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 62e36545385a6b59427a2ac316838b50b821ef15. Bug: 348542941 Test: build Change-Id: I825c7b763c817da0eb067488a2ca6e983f1b94f8 --- device-cheetah.mk | 4 ---- device-panther.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index bf4bd53..bb3e030 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -283,11 +283,7 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/pantah # 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) diff --git a/device-panther.mk b/device-panther.mk index b4573aa..091ce97 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -262,11 +262,7 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/pantah # 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 d3d2c4e680cfaed6c1e1b85e1be872b9ff48a897 Mon Sep 17 00:00:00 2001 From: Barry Date: Tue, 25 Jun 2024 10:07:39 +0000 Subject: [PATCH 06/33] BT: update LEA unicast allowlist SONY Add Sony WF-1000XM5 into unicast default allowlist. Bug: 349296931 Test: build and check system property Flag: NONE allowlist extension Change-Id: I67fca774db6635a3bfc5069a9f02b0a45fd9b31f --- 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 bb3e030..49a3845 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -222,7 +222,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-panther.mk b/device-panther.mk index 091ce97..0990bbd 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -192,7 +192,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 # Support LE & Classic concurrent encryption (b/330704060) PRODUCT_PRODUCT_PROPERTIES += \ From 6b32b0b465c0c29cd1aa76451b2a6331acfea0f9 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 05:24:39 +0000 Subject: [PATCH 07/33] 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: I0d108ee41c8aeb794777b9d3c0e39b8ed5610ec7 --- device-cheetah.mk | 24 ++++++-- device-panther.mk | 24 ++++++-- location/gps.6.1.xml.c10 | 106 ++++++++++++++++++++++++++++++++++ location/gps.6.1.xml.p10 | 106 ++++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.c10 | 105 +++++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.p10 | 105 +++++++++++++++++++++++++++++++++ 6 files changed, 458 insertions(+), 12 deletions(-) create mode 100644 location/gps.6.1.xml.c10 create mode 100644 location/gps.6.1.xml.p10 create mode 100644 location/gps_user.6.1.xml.c10 create mode 100644 location/gps_user.6.1.xml.p10 diff --git a/device-cheetah.mk b/device-cheetah.mk index 49a3845..e110a54 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -302,15 +302,27 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/pantah/location/gps.6.1.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/pantah/location/gps_user.6.1.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Set support one-handed mode diff --git a/device-panther.mk b/device-panther.mk index 0990bbd..f64ee08 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -285,15 +285,27 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/pantah/location/gps.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ - device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/pantah/location/gps_user.6.1.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Set support one-handed mode diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 new file mode 100644 index 0000000..ddc4e95 --- /dev/null +++ b/location/gps.6.1.xml.c10 @@ -0,0 +1,106 @@ + + + + + + + + + + diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10 new file mode 100644 index 0000000..46e0406 --- /dev/null +++ b/location/gps.6.1.xml.p10 @@ -0,0 +1,106 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.c10 b/location/gps_user.6.1.xml.c10 new file mode 100644 index 0000000..f00c918 --- /dev/null +++ b/location/gps_user.6.1.xml.c10 @@ -0,0 +1,105 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.p10 b/location/gps_user.6.1.xml.p10 new file mode 100644 index 0000000..6f71d32 --- /dev/null +++ b/location/gps_user.6.1.xml.p10 @@ -0,0 +1,105 @@ + + + + + + + + + + From 8f48729607f5550d5e6c6ce68b0681726f20e85a Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 2 Jul 2024 08:44:48 +0000 Subject: [PATCH 08/33] Remove NewlyIdleBalancer NewlyIdleBalancer is not supported in kernel 6.1, so remvoe it. Besides, the newly idle balance is mainly for ADPF now, the power impact should be much less than before. Bug: 350212757 Test: build pass Change-Id: I1491954b96baa96821da09975fcdc52c8db85cab --- powerhint-cheetah.json | 32 -------------------------------- powerhint-panther.json | 32 -------------------------------- 2 files changed, 64 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 8dac037..982c19c 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -356,14 +356,6 @@ ], "ResetOnInit": true }, - { - "Name": "NewlyIdleBalancer", - "Path": "/proc/vendor_sched/idle_balancer", - "Values": [ - "0", - "1" - ] - }, { "Name": "DisplayWakeup", "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", @@ -1419,12 +1411,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1551,12 +1537,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1665,12 +1645,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1749,12 +1723,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/powerhint-panther.json b/powerhint-panther.json index e87a278..2ab2d93 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -336,14 +336,6 @@ ], "ResetOnInit": true }, - { - "Name": "NewlyIdleBalancer", - "Path": "/proc/vendor_sched/idle_balancer", - "Values": [ - "0", - "1" - ] - }, { "Name": "DisplayWakeup", "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", @@ -1275,12 +1267,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1407,12 +1393,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1521,12 +1501,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1605,12 +1579,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From f66141fb8af475b8eb092c98ea299517e2aa2fe8 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Tue, 9 Jul 2024 07:42:48 +0000 Subject: [PATCH 09/33] add device id Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: Ica2e8c1154e6013229a5e91a642a89efbb754b1f --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index e110a54..3cf36be 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -422,3 +422,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.oem_id=00e0 \ ro.quick_start.device_id=cheetah + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20490 diff --git a/device-panther.mk b/device-panther.mk index f64ee08..002b61b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -405,3 +405,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.oem_id=00e0 \ ro.quick_start.device_id=panther + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20489 From 5d8a141aad34e31a92efd57ae9e8398eed1417e4 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:10:05 +0000 Subject: [PATCH 10/33] pantah: Use build_flags for SVN Flag: build.RELEASE_SVN_CHEETAH Flag: build.RELEASE_SVN_PANTHER Bug: 332726030 Change-Id: I97d624c43e943e2dc21efc2edb8360c43a4e48aa --- device-cheetah.mk | 9 ++++++++- device-panther.mk | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3cf36be..c6b829b 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -334,8 +334,15 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g # Increment the SVN for any official public releases +ifdef RELEASE_SVN_CHEETAH +TARGET_SVN ?= $(RELEASE_SVN_CHEETAH) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 59 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=59 + ro.vendor.build.svn=$(TARGET_SVN) # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/device-panther.mk b/device-panther.mk index 002b61b..2555047 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -317,8 +317,15 @@ PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=3g # Increment the SVN for any official public releases +ifdef RELEASE_SVN_PANTHER +TARGET_SVN ?= $(RELEASE_SVN_PANTHER) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 59 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=59 + ro.vendor.build.svn=$(TARGET_SVN) # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 8b971c6305a6b5a1d734d4955b327cb760974825 Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Thu, 18 Jul 2024 11:26:41 +0000 Subject: [PATCH 11/33] Update antenna position coordinates Bug: 353895373 Test: manual Flag: EXEMPT bugfix Change-Id: I43aa0dccc2f3d16d6f89793c33878ff96ecbf358 --- cheetah/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- panther/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml index 2a576a6..bf27339 100644 --- a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 38 - 100 + 59 true diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml index 43d41fc..ec1af6f 100644 --- a/panther/rro_overlays/NfcOverlay/res/values/config.xml +++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 38 - 97 + 53 true From cf3cc4a874e817fb330988d982866183eba79208 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 13:48:25 +0000 Subject: [PATCH 12/33] Update cheetah SVN to 60 Bug: 352170103 Change-Id: Id9033d8d37de66bbb238aead0dbf7f380f4f9d10 Flag: EXEMPT bugfix --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index c6b829b..71cc1e0 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -338,7 +338,7 @@ ifdef RELEASE_SVN_CHEETAH TARGET_SVN ?= $(RELEASE_SVN_CHEETAH) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 59 +TARGET_SVN ?= 60 endif PRODUCT_VENDOR_PROPERTIES += \ From cc435349480d6fbffc45c130fe934bb2894b9e76 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 13:58:25 +0000 Subject: [PATCH 13/33] Update panther SVN to 60 Bug: 352170103 Change-Id: I5793f3fcbd31221a8c47658ad00629bcbf704bc0 Flag: EXEMPT bugfix --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 2555047..4b4a544 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -321,7 +321,7 @@ ifdef RELEASE_SVN_PANTHER TARGET_SVN ?= $(RELEASE_SVN_PANTHER) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 59 +TARGET_SVN ?= 60 endif PRODUCT_VENDOR_PROPERTIES += \ From d0416c3f875fa69e09608ff39bea443571636301 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 25 Jul 2024 20:22:07 +0000 Subject: [PATCH 14/33] Adpf:pantah: 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: I83749ce2471030b74d23d297e39354381b6d69a6 --- powerhint-cheetah-a0.json | 33 ++++++++++++++++++--------------- powerhint-cheetah.json | 33 ++++++++++++++++++--------------- powerhint-cloudripper.json | 33 ++++++++++++++++++--------------- powerhint-panther-a0.json | 33 ++++++++++++++++++--------------- powerhint-panther.json | 33 ++++++++++++++++++--------------- powerhint-ravenclaw.json | 33 ++++++++++++++++++--------------- 6 files changed, 108 insertions(+), 90 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index a6bcdf0..154ca19 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -2128,11 +2128,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 @@ -2163,11 +2164,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 @@ -2198,11 +2200,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 982c19c..a0bd60c 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2292,11 +2292,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 @@ -2327,11 +2328,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 @@ -2362,11 +2364,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 diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 856de7a..3c176a7 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -1244,11 +1244,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 @@ -1279,11 +1280,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 @@ -1314,11 +1316,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index de5ee4e..d1de182 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -2015,11 +2015,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 @@ -2050,11 +2051,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 @@ -2085,11 +2087,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 diff --git a/powerhint-panther.json b/powerhint-panther.json index 2ab2d93..3cd63b6 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -2148,11 +2148,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 @@ -2183,11 +2184,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 @@ -2218,11 +2220,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 diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 269bd21..eed5603 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -1244,11 +1244,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 @@ -1279,11 +1280,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 @@ -1314,11 +1316,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.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 5d0fc14b18aca54cd3d937c931b3bc40ad451721 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Mon, 29 Jul 2024 04:10:06 +0000 Subject: [PATCH 15/33] gps: Enable ExitOnComFailure Enable ExitOnComFailure so gpsd will call exit() instead of calling abort() when com failed due to system performance degradation. Test: on device Bug: 341508348 Change-Id: I5bb4e9aa4aa81f360a14f38a6509de3d7187ade7 --- location/gps.6.1.xml.c10 | 1 + location/gps.6.1.xml.p10 | 1 + location/gps.xml | 1 + location/gps.xml.c10 | 1 + location/gps.xml.p10 | 1 + 5 files changed, 5 insertions(+) diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 index ddc4e95..437fcce 100644 --- a/location/gps.6.1.xml.c10 +++ b/location/gps.6.1.xml.c10 @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10 index 46e0406..f30d7a1 100644 --- a/location/gps.6.1.xml.p10 +++ b/location/gps.6.1.xml.p10 @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" diff --git a/location/gps.xml b/location/gps.xml index cda0fd0..d27a6f7 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index 7d43d2d..f82d6f0 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 2aa18b6..bd2798d 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" CpLppHighAccuracyShapeMode="1" From 261c3b3c7a30a6303eef93cade0cd0619bee1b80 Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Mon, 22 Jul 2024 17:08:05 -0700 Subject: [PATCH 16/33] haptics: Update output distortion gain Recommended output distortion gain is 0.38. Bug: 328799172 Test: getprop | grep hapticgenerator Flag: EXEMPT bugfix Change-Id: I51f9e95726ed03a5605594130debbf4a628f28f6 --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 71cc1e0..3ffe2aa 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -388,6 +388,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.38 + # Keyboard bottom and side padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ diff --git a/device-panther.mk b/device-panther.mk index 4b4a544..1b04d16 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -373,6 +373,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.38 + # Keyboard bottom padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ From 6e7023436a2a954ee031d6b543b3d09b85ba8838 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sat, 6 Apr 2024 00:24:25 +0000 Subject: [PATCH 17/33] pantah: Add build_flags based properties for SMR/EMR build Flag: build.RELEASE_IS_SMR Flag: build.RELEASE_IS_EMR Flag: build.RELEASE_BASE_OS_CHEETAH Flag: build.RELEASE_BASE_OS_PANTHER Bug: 155105803 Change-Id: Ia43ad62294cedc99e0f63d952dede896fa81e7bb --- device-cheetah.mk | 18 ++++++++++++++++++ device-panther.mk | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3ffe2aa..08b4c9b 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -344,6 +344,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_CHEETAH)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_CHEETAH) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_CHEETAH)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_CHEETAH) + endif +endif # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=3 \ diff --git a/device-panther.mk b/device-panther.mk index 1b04d16..c9f31c8 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -327,6 +327,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_PANTHER)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_PANTHER) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_PANTHER)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_PANTHER) + endif +endif # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 \ From 64ffa89f7bb2d24d7ff8bdf03d03a2c54f384a09 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 9 Aug 2024 08:33:56 +0000 Subject: [PATCH 18/33] update OWNERS to include Android.bp Flag: EXEMPT only changing OWNERS Bug: 357036384 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5df58ebfc9962923f1b26e91b00766d524897aec) Merged-In: I1d2b707e5c75371dac7827c4065133527eff0598 Change-Id: I1d2b707e5c75371dac7827c4065133527eff0598 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index f5be82c..e78157d 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 68458452d7737d3d0fc3a9a828fc89161177d6ac Mon Sep 17 00:00:00 2001 From: samou Date: Tue, 16 Jul 2024 07:45:46 +0000 Subject: [PATCH 19/33] thermal: Remove bcl related tzones Flag: EXEMPT tuning changes Bug: 349935208 Test: Confirm boot Change-Id: Iae3decd1d4063b1f41b4c5cdbd43b3eba1d9269f Signed-off-by: samou --- powerhint-cheetah-a0.json | 12 - powerhint-cheetah.json | 12 - powerhint-cloudripper.json | 12 - powerhint-panther-a0.json | 12 - powerhint-panther.json | 12 - powerhint-ravenclaw.json | 12 - thermal_info_config_cheetah.json | 286 -------------------- thermal_info_config_cloudripper.json | 377 --------------------------- thermal_info_config_panther.json | 287 -------------------- 9 files changed, 1022 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 154ca19..46267a3 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -1812,18 +1812,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/powerhint-cheetah.json b/powerhint-cheetah.json index a0bd60c..f7f991e 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2000,18 +2000,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/powerhint-cloudripper.json b/powerhint-cloudripper.json index 3c176a7..7bd4bb7 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -1150,18 +1150,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/powerhint-panther-a0.json b/powerhint-panther-a0.json index d1de182..4616902 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -1699,18 +1699,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/powerhint-panther.json b/powerhint-panther.json index 3cd63b6..866fb9c 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1856,18 +1856,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/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index eed5603..ec2e3a2 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -1150,18 +1150,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_cheetah.json b/thermal_info_config_cheetah.json index e649bc6..8e43e6d 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -429,292 +429,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 - }, - { - "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, - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - } - ] - }, - { - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - } - ] - }, - { - "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, - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "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, - "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, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - }, - { - "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, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "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, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "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":"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, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - }, - { - "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 - }, - { - "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 } ], "CoolingDevices":[ diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json index aed1512..8034a32 100644 --- a/thermal_info_config_cloudripper.json +++ b/thermal_info_config_cloudripper.json @@ -60,383 +60,6 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "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" - ], - "VrThreshold":"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" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - 80, - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "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, - "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - }, - { - "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" - ], - "VrThreshold":"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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "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 - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "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":"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, - "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] - }, - { - "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 - }, - { - "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 - }, - { - "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 - }, - { - "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 - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index d89803f..3df81f9 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -429,293 +429,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, - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - } - ] - }, - { - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - } - ] - }, - { - "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, - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - } - ] - }, - { - "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, - "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, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - }, - { - "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, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "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, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "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":"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, - "Monitor":true, - "PollingDelay":0, - "PassiveDelay":1000, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - }, - { - "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 - }, - { - "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 } ], "CoolingDevices":[ From 27a392ee5dc6f03aa341bb458fe97e39ca217dc7 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:03:12 +0000 Subject: [PATCH 20/33] Update cheetah SVN to 61 Bug: 352170103 Change-Id: I4125bd12a8816a88e560d9c4e8a658b7266e471f Flag: EXEMPT bugfix --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 08b4c9b..684eb4b 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -338,7 +338,7 @@ ifdef RELEASE_SVN_CHEETAH TARGET_SVN ?= $(RELEASE_SVN_CHEETAH) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 60 +TARGET_SVN ?= 61 endif PRODUCT_VENDOR_PROPERTIES += \ From 28472ca706e3dcd8a04ea26189d7728f210c27d7 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 22:50:00 +0000 Subject: [PATCH 21/33] Update panther SVN to 61 Bug: 352170103 Change-Id: Id2e99fca9d666030302fb7f99835c01e75100934 Flag: EXEMPT bugfix --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index c9f31c8..a629af7 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -321,7 +321,7 @@ ifdef RELEASE_SVN_PANTHER TARGET_SVN ?= $(RELEASE_SVN_PANTHER) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 60 +TARGET_SVN ?= 61 endif PRODUCT_VENDOR_PROPERTIES += \ From c12283dc3192131af9f9ca4c3da69f53aba0589a Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 14 Aug 2024 08:38:30 +0000 Subject: [PATCH 22/33] thermal:remove unused state2power value Bug: 355566259 Test: Build test Flag: EXEMPT NDK Change-Id: If63c2eaf5d002af1bae85e14b9b0412e7da81e49 Signed-off-by: Peter (YM) --- thermal_info_config_cheetah.json | 12 ++++-------- thermal_info_config_cloudripper.json | 9 +++------ thermal_info_config_panther.json | 12 ++++-------- thermal_info_config_proto.json | 9 +++------ thermal_info_config_ravenclaw.json | 9 +++------ 5 files changed, 17 insertions(+), 34 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 8e43e6d..bd7ae0b 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -435,26 +435,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":[4371, 3543, 3085, 2293, 1927, 1707, 1394, 1171, 967, 768, 592, 433] + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { "Name":"chg_mdis", diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json index 8034a32..ecdb33b 100644 --- a/thermal_info_config_cloudripper.json +++ b/thermal_info_config_cloudripper.json @@ -80,20 +80,17 @@ { "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", diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 3df81f9..673a690 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -435,26 +435,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":"chg_mdis", diff --git a/thermal_info_config_proto.json b/thermal_info_config_proto.json index ea9c711..a35fca2 100644 --- a/thermal_info_config_proto.json +++ b/thermal_info_config_proto.json @@ -562,20 +562,17 @@ { "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", diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json index 327f033..5e18f9d 100644 --- a/thermal_info_config_ravenclaw.json +++ b/thermal_info_config_ravenclaw.json @@ -659,20 +659,17 @@ { "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", From d7ec3719edee200870275875fc3080560d9e3d24 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 16 Aug 2024 06:21:35 +0000 Subject: [PATCH 23/33] 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: I342bcbfb5ee884aa437d4d4552aeea7d0a9df119 Signed-off-by: Peter (YM) --- thermal_info_config_charge_cheetah.json | 5 ----- thermal_info_config_charge_panther.json | 5 ----- thermal_info_config_cheetah.json | 7 ------- thermal_info_config_panther.json | 7 ------- 4 files changed, 24 deletions(-) diff --git a/thermal_info_config_charge_cheetah.json b/thermal_info_config_charge_cheetah.json index ca7e17a..8091d95 100644 --- a/thermal_info_config_charge_cheetah.json +++ b/thermal_info_config_charge_cheetah.json @@ -3,13 +3,11 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp", "Multiplier":0.001 }, { @@ -17,7 +15,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -26,7 +23,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -34,7 +30,6 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { diff --git a/thermal_info_config_charge_panther.json b/thermal_info_config_charge_panther.json index 7ab7626..915e16c 100644 --- a/thermal_info_config_charge_panther.json +++ b/thermal_info_config_charge_panther.json @@ -3,20 +3,17 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -24,7 +21,6 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { @@ -32,7 +28,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index bd7ae0b..b107385 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -9,19 +9,16 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp", "Multiplier":0.001 }, { @@ -29,7 +26,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -38,7 +34,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -46,13 +41,11 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001 }, { diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index 673a690..862d7c5 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -9,26 +9,22 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/tz_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/tz_temp", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -36,13 +32,11 @@ { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/tz_temp", "Multiplier":0.001 }, { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001 }, { @@ -50,7 +44,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 From 068f26e25ca9955e5251785b5b909b5c77c5c8d4 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 12 Aug 2024 17:10:54 +0800 Subject: [PATCH 24/33] gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay Bug: 358041425 Test: verify pass Change-Id: I9615f6f87d98f991a51eef790627a9122a3f08af --- location/gps.6.1.xml.c10 | 1 + location/gps.6.1.xml.p10 | 1 + location/gps.xml | 1 + location/gps.xml.c10 | 1 + location/gps.xml.p10 | 1 + location/gps_user.6.1.xml.c10 | 1 + location/gps_user.6.1.xml.p10 | 1 + location/gps_user.xml | 1 + location/gps_user.xml.c10 | 1 + location/gps_user.xml.p10 | 1 + 10 files changed, 10 insertions(+) diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 index 437fcce..4458163 100644 --- a/location/gps.6.1.xml.c10 +++ b/location/gps.6.1.xml.c10 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10 index f30d7a1..55f7ef2 100644 --- a/location/gps.6.1.xml.p10 +++ b/location/gps.6.1.xml.p10 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml b/location/gps.xml index d27a6f7..32e1ddc 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index f82d6f0..4421513 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index bd2798d..29cb0e1 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.c10 b/location/gps_user.6.1.xml.c10 index f00c918..378c9de 100644 --- a/location/gps_user.6.1.xml.c10 +++ b/location/gps_user.6.1.xml.c10 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.p10 b/location/gps_user.6.1.xml.p10 index 6f71d32..018d204 100644 --- a/location/gps_user.6.1.xml.p10 +++ b/location/gps_user.6.1.xml.p10 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 3cde3f9..c2b3c57 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 84c35e7..4acdcbf 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index 3832f9b..7aaa0a7 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" From 5af050c92e98141fbd0e3aa98ad0c706832bb219 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 27 Aug 2024 06:15:15 +0000 Subject: [PATCH 25/33] gps: Re-enable GLO & QZSS in US Test: on-device Bug: 353579502 Change-Id: Idad61501a4ff862163fb6710fe1a6946d05c3f85 --- 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, 20 insertions(+) diff --git a/location/gps.6.1.xml.c10 b/location/gps.6.1.xml.c10 index 4458163..d582845 100644 --- a/location/gps.6.1.xml.c10 +++ b/location/gps.6.1.xml.c10 @@ -100,6 +100,8 @@ /> diff --git a/location/gps.6.1.xml.p10 b/location/gps.6.1.xml.p10 index 55f7ef2..d132bfa 100644 --- a/location/gps.6.1.xml.p10 +++ b/location/gps.6.1.xml.p10 @@ -100,6 +100,8 @@ /> diff --git a/location/gps.xml b/location/gps.xml index 32e1ddc..e091ba3 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -100,6 +100,8 @@ /> diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index 4421513..ddfcd71 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -100,6 +100,8 @@ /> diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 29cb0e1..5ccf3ee 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -100,6 +100,8 @@ /> diff --git a/location/gps_user.6.1.xml.c10 b/location/gps_user.6.1.xml.c10 index 378c9de..2aa6fc4 100644 --- a/location/gps_user.6.1.xml.c10 +++ b/location/gps_user.6.1.xml.c10 @@ -98,6 +98,8 @@ /> diff --git a/location/gps_user.6.1.xml.p10 b/location/gps_user.6.1.xml.p10 index 018d204..ebbc2f7 100644 --- a/location/gps_user.6.1.xml.p10 +++ b/location/gps_user.6.1.xml.p10 @@ -98,6 +98,8 @@ /> diff --git a/location/gps_user.xml b/location/gps_user.xml index c2b3c57..463f991 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -98,6 +98,8 @@ /> diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 4acdcbf..a3c3879 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -98,6 +98,8 @@ /> diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index 7aaa0a7..a0a0103 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -98,6 +98,8 @@ /> From 59e6c38b1961878f1bd49ba3b17069d80907576f Mon Sep 17 00:00:00 2001 From: Ankit Goyal Date: Wed, 28 Aug 2024 22:55:05 -0700 Subject: [PATCH 26/33] Delete mapper4 manifest Bug: 362183626 Flag: EXEMPT manifest update Test: Boot to home on shiba Change-Id: If10ca62f1180f578a133afb3753d3e31ee7606f3 --- manifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index e01d156..18109c6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,15 +48,6 @@ default - - android.hardware.graphics.mapper - passthrough - 4.0 - - IMapper - default - - android.hardware.graphics.composer hwbinder From 579d88fdc79b8d37803175bd50bdd60185983d48 Mon Sep 17 00:00:00 2001 From: Pindar Yang Date: Thu, 29 Aug 2024 11:39:48 +0000 Subject: [PATCH 27/33] move bootloader and radio build flag to device mk Flag: build.RELEASE_GOOGLE_PRODUCT_RADIO_DIR, build.RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR Bug: 362618412 Change-Id: Ib99eab337312bc3568839b7f46e555defb3e1c56 Signed-off-by: Pindar Yang --- cheetah/BoardConfig.mk | 10 ---------- cloudripper/BoardConfig.mk | 8 -------- device-cheetah.mk | 13 +++++++++++++ device-cloudripper.mk | 10 ++++++++++ device-panther.mk | 13 +++++++++++++ device-ravenclaw.mk | 10 ++++++++++ panther/BoardConfig.mk | 10 ---------- ravenclaw/BoardConfig.mk | 8 -------- 8 files changed, 46 insertions(+), 36 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 6f7f2d5..9d18764 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -17,16 +17,6 @@ # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -endif - # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index d923b44..e69540e 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,14 +15,6 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -endif TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true diff --git a/device-cheetah.mk b/device-cheetah.mk index 684eb4b..f2efb5e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -17,6 +17,19 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_CHEETAH_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 723d350..4896cda 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -17,6 +17,16 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif + + # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers diff --git a/device-panther.mk b/device-panther.mk index a629af7..1694d2d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -17,6 +17,19 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_PANTHER_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) +endif + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR) diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 19f0afc..115bdc7 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -17,6 +17,16 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) +else +$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) +endif + + # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 34c72d7..23d00dd 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -21,16 +21,6 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) -endif - ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 0ead4dc..caa2afc 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,14 +15,6 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) -$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),) -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk) -else -$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) -endif TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true From 8962fe3676e2a7f77079d01b1d18fe4b9437ca5c Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Sat, 31 Aug 2024 02:25:50 +0000 Subject: [PATCH 28/33] Disable limiting camera_hal for LAUNCH hint for A0 devices If auto rotation is enabled, it will trigger LAUNCH hint while camera is running if device rotates, which could limit camera_hal tasks to little cores. So, disable it first until there is a new hint for the rotation event. Bug: 358103845 Test: build pass Flag: NONE powerhint change does not support flags Change-Id: I623ea20c5fa1f0d8b4404caf7e0de54f35921fe7 --- powerhint-cheetah-a0.json | 24 ------------------------ powerhint-panther-a0.json | 24 ------------------------ 2 files changed, 48 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 46267a3..0d0a92c 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -773,30 +773,6 @@ "Type": "DoHint", "Value": "LAUNCH_PMU" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 4616902..d75dfca 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -762,30 +762,6 @@ "Type": "DoHint", "Value": "LAUNCH_PMU" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", From ed46d4d34552d4dc46f3832c743f2d7830c0c842 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 4 Sep 2024 21:08:48 -0700 Subject: [PATCH 29/33] cheetah/panther: add etm modules in userdebug/eng builds If etm modules aren't built with kernel prebuilts, then add them manually. Bug: 364755673 Bug: 364309766 Test: build cheetah-trunk_staging-userdebug Flag: build.RELEASE_ETM_IN_USERDEBUG_ENG Change-Id: I5b5ce51ca59c912f5ebbac66b6ade5adc90ec7f5 --- cheetah/BoardConfig.mk | 6 ++++++ device-cheetah.mk | 7 +++++++ device-panther.mk | 7 +++++++ panther/BoardConfig.mk | 6 ++++++ 4 files changed, 26 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 9d18764..d781920 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -33,3 +33,9 @@ include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/cheetah-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif diff --git a/device-cheetah.mk b/device-cheetah.mk index f2efb5e..ba27799 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -468,3 +468,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20490 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/device-panther.mk b/device-panther.mk index 1694d2d..b58d280 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -451,3 +451,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20489 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 23d00dd..b090758 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -38,3 +38,9 @@ include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/panther-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif From e2c00ec807d6b116031bd2b8ce726c7d86ca35fa Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:20:16 +0000 Subject: [PATCH 30/33] Update product id for cheetah and panther Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I94fe27c36cebd8dc444d3c0f1eeaa6564e0b215b --- device-cheetah.mk | 5 +++-- device-panther.mk | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ba27799..4bfe74a 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -466,12 +466,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.device_id=cheetah # Bluetooth device id +# Cheetah: 0x410A PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20490 + bluetooth.device_id.product_id=16650 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif -endif +endif \ No newline at end of file diff --git a/device-panther.mk b/device-panther.mk index b58d280..a50f2ea 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -449,8 +449,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.quick_start.device_id=panther # Bluetooth device id +# Panther: 0x4109 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20489 + bluetooth.device_id.product_id=16649 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) From 8d0fc0c2592a4184c7c790c92a56c8d579c917f3 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:33:57 +0000 Subject: [PATCH 31/33] 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: I1e68490a56b9471909f8b26b6952e042e930eefb Signed-off-by: Robin Peng --- cheetah/BoardConfig.mk | 1 + cloudripper/BoardConfig.mk | 1 + panther/BoardConfig.mk | 1 + ravenclaw/BoardConfig.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index d781920..c5076b3 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -30,6 +30,7 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/cheetah-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index e69540e..7d580f6 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -21,5 +21,6 @@ USES_DEVICE_GOOGLE_CLOUDRIPPER := true include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk include device/google/pantah-sepolicy/cloudripper-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index b090758..efb9dd1 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -35,6 +35,7 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk include device/google/pantah-sepolicy/panther-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index caa2afc..0ae59a1 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -21,5 +21,6 @@ USES_DEVICE_GOOGLE_CLOUDRIPPER := true include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk include device/google/pantah-sepolicy/ravenclaw-sepolicy.mk include device/google/pantah/wifi/BoardConfig-wifi.mk From 1006e3c62686a2773b5d254c4ff00fb67bbaa263 Mon Sep 17 00:00:00 2001 From: James Huang Date: Fri, 26 Jul 2024 15:17:28 +0800 Subject: [PATCH 32/33] gps: Enable Beidou measurements only in the US for P22. Bug: 354884462 Test: Field test in the US Change-Id: I6deccee4bbea32cd7016c6f7449a3dfdc2c67e18 --- location/gps.xml.c10 | 1 + location/gps.xml.p10 | 1 + location/gps_user.xml.c10 | 1 + location/gps_user.xml.p10 | 1 + 4 files changed, 4 insertions(+) diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index ddfcd71..58356f4 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -104,6 +104,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 5ccf3ee..643c2ef 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -104,6 +104,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index a3c3879..2f573bf 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -102,6 +102,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index a0a0103..1198001 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -102,6 +102,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> From eb703190ba947a7e911571ffa5738f330d2eadf2 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:58:14 +0800 Subject: [PATCH 33/33] 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"