From daea5cd2facaa5fa83a339cb8751f8cfdc8a1556 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 28 May 2024 01:59:12 +0000 Subject: [PATCH 01/22] waves: correct config to fix wrong tuning - remove unused controls since the last version isn't expected multiple instance. Bug: 341323676 Test: manual test Signed-off-by: Jasmine Cha (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be9842b68e01735d96019ab8f214c8b43ee00b4d) Merged-In: I69e5f4125044c3a56e8f44f5bace7cca3d06717b Change-Id: I69e5f4125044c3a56e8f44f5bace7cca3d06717b --- audio/oriole/tuning/waves/waves_config.ini | 3 --- audio/raven/tuning/waves/waves_config.ini | 3 --- 2 files changed, 6 deletions(-) diff --git a/audio/oriole/tuning/waves/waves_config.ini b/audio/oriole/tuning/waves/waves_config.ini index ba12a8e..f330db0 100644 --- a/audio/oriole/tuning/waves/waves_config.ini +++ b/audio/oriole/tuning/waves/waves_config.ini @@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER -HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## [HAL_SUPPORTED_CONTROLS] SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL -A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC -USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so diff --git a/audio/raven/tuning/waves/waves_config.ini b/audio/raven/tuning/waves/waves_config.ini index ba12a8e..f330db0 100644 --- a/audio/raven/tuning/waves/waves_config.ini +++ b/audio/raven/tuning/waves/waves_config.ini @@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER -HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## # This defines available CONTROL configurations. Only define the CONTROL if you need it. @@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2 ######################################################################################################## [HAL_SUPPORTED_CONTROLS] SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL -A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC -USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC [COEFS_CONVERTER_SETTING] AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so From 9bef8781e7589000d31226b896a9014b940b9538 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 09:43:41 +0000 Subject: [PATCH 02/22] 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: I6ea5be077c749684ba35d5e41fafbc82144c5392 --- device-oriole.mk | 14 ++++- device-raven.mk | 14 ++++- location/gps.6.1.xml.oriole | 105 +++++++++++++++++++++++++++++++ location/gps.6.1.xml.raven | 105 +++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.oriole | 104 ++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.raven | 104 ++++++++++++++++++++++++++++++ 6 files changed, 442 insertions(+), 4 deletions(-) create mode 100644 location/gps.6.1.xml.oriole create mode 100644 location/gps.6.1.xml.raven create mode 100644 location/gps_user.6.1.xml.oriole create mode 100644 location/gps_user.6.1.xml.raven diff --git a/device-oriole.mk b/device-oriole.mk index 0b74ed1..f41eb7e 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -281,11 +281,21 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/raviole/location/gps.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/raviole/location/gps_user.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Enable DeviceAsWebcam support diff --git a/device-raven.mk b/device-raven.mk index 8382360..6d90b66 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -292,11 +292,21 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/raviole/location/gps.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/raviole/location/gps_user.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Enable DeviceAsWebcam support diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole new file mode 100644 index 0000000..34a4552 --- /dev/null +++ b/location/gps.6.1.xml.oriole @@ -0,0 +1,105 @@ + + + + + + + + + + diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven new file mode 100644 index 0000000..da9c8b4 --- /dev/null +++ b/location/gps.6.1.xml.raven @@ -0,0 +1,105 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole new file mode 100644 index 0000000..2307636 --- /dev/null +++ b/location/gps_user.6.1.xml.oriole @@ -0,0 +1,104 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven new file mode 100644 index 0000000..00d9b45 --- /dev/null +++ b/location/gps_user.6.1.xml.raven @@ -0,0 +1,104 @@ + + + + + + + + + + From 065a8c2c8ddb9338cbc3737a5ac929cf169cfc94 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 2 Jul 2024 08:50:11 +0000 Subject: [PATCH 03/22] 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: Ib952e2c492fbc65b2529d997c511631c341e2a34 --- powerhint-oriole.json | 32 -------------------------------- powerhint-raven.json | 32 -------------------------------- 2 files changed, 64 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 9264d09..bdca86d 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -319,14 +319,6 @@ ], "ResetOnInit": true }, - { - "Name": "NewlyIdleBalancer", - "Path": "/proc/vendor_sched/idle_balancer", - "Values": [ - "0", - "1" - ] - }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", @@ -1070,12 +1062,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1148,12 +1134,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1208,12 +1188,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1274,12 +1248,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-raven.json b/powerhint-raven.json index af6d3c7..1470f54 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -318,14 +318,6 @@ ], "ResetOnInit": true }, - { - "Name": "NewlyIdleBalancer", - "Path": "/proc/vendor_sched/idle_balancer", - "Values": [ - "0", - "1" - ] - }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", @@ -1069,12 +1061,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1147,12 +1133,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1207,12 +1187,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1273,12 +1247,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From 6a11d1a9da2c7c69862b3f985e81f12ddd8d05d7 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 11 Jul 2024 03:49:32 +0000 Subject: [PATCH 04/22] add device id Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I68bcd8f9d5d3ff4c078a30cbf09a52a567e9dfe5 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index f41eb7e..4dbe602 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -309,3 +309,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Disable AVF Remote Attestation PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20486 diff --git a/device-raven.mk b/device-raven.mk index 6d90b66..0c0cdda 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -319,3 +319,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Disable AVF Remote Attestation PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20487 From 8062fbd55b92f21bfae9671aa1e8e9a0c100780e Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:07:01 +0000 Subject: [PATCH 05/22] raviole: Use build_flags for SVN Flag: build.RELEASE_SVN_ORIOLE Flag: build.RELEASE_SVN_RAVEN Bug: 332726030 Change-Id: I60035ec95cf07e8e992981a61738aa6f0a6d22ef --- device-oriole.mk | 9 ++++++++- device-raven.mk | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4dbe602..a91973d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -193,8 +193,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) endif # Increment the SVN for any official public releases +ifdef RELEASE_SVN_ORIOLE +TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 84 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=84 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 0c0cdda..ceba2f7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -197,8 +197,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) endif # Increment the SVN for any official public releases +ifdef RELEASE_SVN_RAVEN +TARGET_SVN ?= $(RELEASE_SVN_RAVEN) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 84 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=84 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f7b5e0409681091598a2743ed2190f57bd3306c0 Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Thu, 18 Jul 2024 11:34:37 +0000 Subject: [PATCH 06/22] Update antenna position coordinates Bug: 353895373 Test: manual Flag: EXEMPT bugfix Change-Id: Ic485114a583e43a2e49a1f3168436d168943da90 --- oriole/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- raven/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml index 1b70812..20ac97d 100644 --- a/oriole/rro_overlays/NfcOverlay/res/values/config.xml +++ b/oriole/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 36 - 106 + 51 true diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml index 9545f18..43b0eda 100644 --- a/raven/rro_overlays/NfcOverlay/res/values/config.xml +++ b/raven/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 36 - 106 + 61 true From 14c718c22f457c542885edea58c248356b21885b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 12 Jul 2024 23:27:52 +0000 Subject: [PATCH 07/22] Update raven SVN to 85 Bug: 352170103 Flag: EXEMPT bugfix Change-Id: I5514206adfd5f86fe1807f09132d5d3e319d45b6 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index ceba2f7..1e3d6ea 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -201,7 +201,7 @@ ifdef RELEASE_SVN_RAVEN TARGET_SVN ?= $(RELEASE_SVN_RAVEN) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 84 +TARGET_SVN ?= 85 endif PRODUCT_VENDOR_PROPERTIES += \ From 419a9a7da3d3208145d728f18b4a4e200c9cd720 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 12 Jul 2024 23:15:18 +0000 Subject: [PATCH 08/22] Update oriole SVN to 85 Bug: 352170103 Flag: EXEMPT bugfix Change-Id: Iffe880b97e0296047b9e2b9c9929d67d09d257b6 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index a91973d..26b112a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -197,7 +197,7 @@ ifdef RELEASE_SVN_ORIOLE TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 84 +TARGET_SVN ?= 85 endif PRODUCT_VENDOR_PROPERTIES += \ From 12a2aec7bdf7264214c9e1def74c68c8fa75b658 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 22:04:16 +0000 Subject: [PATCH 09/22] Update oriole SVN to 84 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3bebdc87659369986910fdbf8b46f5adb1ab2c52) Merged-In: Ia346c23d8446075d901cce4a08b7f7513ab3c496 Change-Id: Ia346c23d8446075d901cce4a08b7f7513ab3c496 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index f72aefe..0b74ed1 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=83 + ro.vendor.build.svn=84 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 245f5834b556c0fd542fa925df87b017774fb0a0 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 23:06:58 +0000 Subject: [PATCH 10/22] Update raven SVN to 84 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eb3b22d11c82114e188c6ef220d8dd7f791af947) Merged-In: I2b4b94a72115bc2a7f7200ce7469a74cc5bd7114 Change-Id: I2b4b94a72115bc2a7f7200ce7469a74cc5bd7114 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index a14a304..8382360 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -198,7 +198,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=83 + ro.vendor.build.svn=84 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From bfa4bc9b4d6ebbd673d3523cfde9de316423ad7f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:07:01 +0000 Subject: [PATCH 11/22] raviole: Use build_flags for SVN Flag: build.RELEASE_SVN_ORIOLE Flag: build.RELEASE_SVN_RAVEN Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8062fbd55b92f21bfae9671aa1e8e9a0c100780e) Merged-In: I60035ec95cf07e8e992981a61738aa6f0a6d22ef Change-Id: I60035ec95cf07e8e992981a61738aa6f0a6d22ef --- device-oriole.mk | 9 ++++++++- device-raven.mk | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 0b74ed1..03a5834 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -193,8 +193,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) endif # Increment the SVN for any official public releases +ifdef RELEASE_SVN_ORIOLE +TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 84 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=84 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 8382360..7af865f 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -197,8 +197,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) endif # Increment the SVN for any official public releases +ifdef RELEASE_SVN_RAVEN +TARGET_SVN ?= $(RELEASE_SVN_RAVEN) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 84 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=84 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From fba5f0b2438798906e35a42da99ccf24dada2145 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 12 Jul 2024 23:27:52 +0000 Subject: [PATCH 12/22] Update raven SVN to 85 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:14c718c22f457c542885edea58c248356b21885b) Merged-In: I5514206adfd5f86fe1807f09132d5d3e319d45b6 Change-Id: I5514206adfd5f86fe1807f09132d5d3e319d45b6 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 7af865f..03b3b44 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -201,7 +201,7 @@ ifdef RELEASE_SVN_RAVEN TARGET_SVN ?= $(RELEASE_SVN_RAVEN) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 84 +TARGET_SVN ?= 85 endif PRODUCT_VENDOR_PROPERTIES += \ From ac3a513033003ca1751d57394c61cb88f95f2403 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 12 Jul 2024 23:15:18 +0000 Subject: [PATCH 13/22] Update oriole SVN to 85 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:419a9a7da3d3208145d728f18b4a4e200c9cd720) Merged-In: Iffe880b97e0296047b9e2b9c9929d67d09d257b6 Change-Id: Iffe880b97e0296047b9e2b9c9929d67d09d257b6 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 03a5834..7de385a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -197,7 +197,7 @@ ifdef RELEASE_SVN_ORIOLE TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 84 +TARGET_SVN ?= 85 endif PRODUCT_VENDOR_PROPERTIES += \ From 25cf133606aaff70868989ed26020dbfb39111e0 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 25 Jul 2024 20:08:12 +0000 Subject: [PATCH 14/22] Adpf:raviole: 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: Ib2dea175a3a9ed3b364e6168341aeb3b01d6bed4 --- powerhint-oriole-mainline.json | 33 ++++++++++++++++++--------------- powerhint-oriole.json | 33 ++++++++++++++++++--------------- powerhint-raven-mainline.json | 33 ++++++++++++++++++--------------- powerhint-raven.json | 33 ++++++++++++++++++--------------- powerhint-slider.json | 33 ++++++++++++++++++--------------- powerhint-whitefin.json | 33 ++++++++++++++++++--------------- 6 files changed, 108 insertions(+), 90 deletions(-) diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json index 29dd8ab..ee7eefd 100644 --- a/powerhint-oriole-mainline.json +++ b/powerhint-oriole-mainline.json @@ -1241,11 +1241,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "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 @@ -1274,11 +1275,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "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 @@ -1307,11 +1309,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "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-oriole.json b/powerhint-oriole.json index bdca86d..2385b5b 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1726,11 +1726,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 @@ -1760,11 +1761,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 @@ -1794,11 +1796,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-raven-mainline.json b/powerhint-raven-mainline.json index a748e0e..b9a8022 100644 --- a/powerhint-raven-mainline.json +++ b/powerhint-raven-mainline.json @@ -1222,11 +1222,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "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 @@ -1255,11 +1256,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "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 @@ -1288,11 +1290,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "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-raven.json b/powerhint-raven.json index 1470f54..d449cdd 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1707,11 +1707,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 @@ -1741,11 +1742,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 @@ -1775,11 +1777,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-slider.json b/powerhint-slider.json index 98f770e..77cc40c 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -1513,11 +1513,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 @@ -1547,11 +1548,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 @@ -1581,11 +1583,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-whitefin.json b/powerhint-whitefin.json index a53293f..80bd297 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -1480,11 +1480,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 @@ -1514,11 +1515,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 @@ -1548,11 +1550,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 e5d07d2fad4e5455001b6ac6a264beea4ea410b6 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Mon, 29 Jul 2024 04:14:56 +0000 Subject: [PATCH 15/22] 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: Ia1af6a5e13307b6ed9887969449e42b3e4eeb1ef --- location/gps.6.1.xml.oriole | 1 + location/gps.6.1.xml.raven | 1 + location/gps.xml | 1 + location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + 5 files changed, 5 insertions(+) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index 34a4552..90abf83 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index da9c8b4..f759bf5 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" diff --git a/location/gps.xml b/location/gps.xml index fb8dd62..ef328be 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" ReAidingOnHotStart="false" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 7dc695c..ae9f6fc 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 31cf6c9..baea540 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" From 3f6f5bdb3835c1ef292f77f4549a3c431cc156ef Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Mon, 22 Jul 2024 17:13:23 -0700 Subject: [PATCH 16/22] haptics: Update output distortion gain Recommended output distortion gain is 0.32. Bug: 328799172 Test: getprop | grep hapticgenerator Flag: EXEMPT bugfix Change-Id: Ib531803a448122723b631af8b3cd8d765d027fbd --- device-oriole.mk | 4 ++-- device-raven.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 26b112a..bfd2ebe 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -253,8 +253,8 @@ PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service # Override default distortion output gain according to UX experiments -PRODUCT_PRODUCT_PROPERTIES += \ - vendor.audio.hapticgenerator.distortion.output.gain=0.5 +PRODUCT_VENDOR_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.32 # RKPD PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 1e3d6ea..4e09b42 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -261,8 +261,8 @@ PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service # Override default distortion output gain according to UX experiments -PRODUCT_PRODUCT_PROPERTIES += \ - vendor.audio.hapticgenerator.distortion.output.gain=0.5 +PRODUCT_VENDOR_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.32 # RKPD PRODUCT_PRODUCT_PROPERTIES += \ From efffce035fe2f376642cc733d7cf9950871b12e5 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sat, 6 Apr 2024 00:05:53 +0000 Subject: [PATCH 17/22] raviole: Add build_flags based properties for SMR/EMR build Flag: build.RELEASE_IS_SMR Flag: build.RELEASE_IS_EMR Flag: build.RELEASE_BASE_OS_ORIOLE Flag: build.RELEASE_BASE_OS_RAVEN Bug: 155105803 Change-Id: I79f963805e5f96c05c3c388a4b0b70be30f9ce8a --- device-oriole.mk | 19 +++++++++++++++++++ device-raven.mk | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index bfd2ebe..f852140 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -203,6 +203,25 @@ endif PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.build.svn=$(TARGET_SVN) +# Set device family property for SMR builds +PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.device_family=O6R4B9 + +# Set build properties for SMR builds +ifeq ($(RELEASE_IS_SMR), true) + ifneq (,$(RELEASE_BASE_OS_ORIOLE)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_ORIOLE) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_ORIOLE)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_ORIOLE) + endif +endif + # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ ro.support_hide_display_cutout=true diff --git a/device-raven.mk b/device-raven.mk index 4e09b42..c69116a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -207,6 +207,25 @@ endif PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.build.svn=$(TARGET_SVN) +# Set device family property for SMR +PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.device_family=O6R4B9 + +# Set build properties for SMR builds +ifeq ($(RELEASE_IS_SMR), true) + ifneq (,$(RELEASE_BASE_OS_RAVEN)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_RAVEN) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_RAVEN)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_RAVEN) + endif +endif + # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ ro.support_hide_display_cutout=true From 78d5dad4636c0819f519a1359b69b43822706da2 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 9 Aug 2024 08:34:01 +0000 Subject: [PATCH 18/22] update OWNERS to include Android.bp Flag: EXEMPT only changing OWNERS Bug: 357036384 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5136bbc4d0c80e7ed6b9ebefdb163c00f0129a08) Merged-In: Ibe99b38eec46054507e98f5f24bc1120b6f85c00 Change-Id: Ibe99b38eec46054507e98f5f24bc1120b6f85c00 --- 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 c899c859ae06099979a7625a28ad387703850fc8 Mon Sep 17 00:00:00 2001 From: samou Date: Tue, 16 Jul 2024 07:50:34 +0000 Subject: [PATCH 19/22] thermal: Remove bcl related tzones Flag: EXEMPT tuning changes Bug: 349935208 Test: Confirm boot Change-Id: I3ffdc8fa36d40368ae117141cda79805b140f2b3 Signed-off-by: samou --- powerhint-oriole-mainline.json | 12 --- powerhint-oriole.json | 12 --- powerhint-raven-mainline.json | 12 --- powerhint-raven.json | 12 --- powerhint-slider.json | 12 --- powerhint-whitefin.json | 12 --- thermal_info_config_oriole.json | 158 --------------------------- thermal_info_config_raven.json | 158 --------------------------- thermal_info_config_slider.json | 171 ------------------------------ thermal_info_config_whitefin.json | 171 ------------------------------ 10 files changed, 730 deletions(-) diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json index ee7eefd..57078f2 100644 --- a/powerhint-oriole-mainline.json +++ b/powerhint-oriole-mainline.json @@ -1023,18 +1023,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-oriole.json b/powerhint-oriole.json index 2385b5b..239a90d 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1459,18 +1459,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-raven-mainline.json b/powerhint-raven-mainline.json index b9a8022..9be9f7f 100644 --- a/powerhint-raven-mainline.json +++ b/powerhint-raven-mainline.json @@ -1004,18 +1004,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-raven.json b/powerhint-raven.json index d449cdd..fd59158 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1440,18 +1440,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-slider.json b/powerhint-slider.json index 77cc40c..1de48ef 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -1348,18 +1348,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-whitefin.json b/powerhint-whitefin.json index 80bd297..9a842a3 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -1333,18 +1333,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_oriole.json b/thermal_info_config_oriole.json index ad24136..be128fa 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -449,164 +449,6 @@ "VrThreshold":"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", "NAN", 90, "NAN", "NAN", "NAN"], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - } - ] - }, - { - "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], - "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", 10500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 6f3b0d0..eecaacf 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -439,164 +439,6 @@ "VrThreshold":"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", "NAN", 90, "NAN", "NAN", "NAN"], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "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, - "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":"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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "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, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - } - ] - }, - { - "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], - "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", 10500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json index 16c795c..6034f03 100644 --- a/thermal_info_config_slider.json +++ b/thermal_info_config_slider.json @@ -70,22 +70,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":"battery", "Type":"BATTERY", @@ -102,161 +86,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", - "Combination":[ - "battery", - "battery_cycle", - "smpl_gm" - ], - "Coefficient":[ - "-10000", - "400", - "1400" - ], - "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": "smpl_gm", - "Combination":[ - "battery", - "battery_cycle", - "smpl_gm" - ], - "Coefficient":[ - "-10000", - "400", - "1400" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1400, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json index 16c795c..6034f03 100644 --- a/thermal_info_config_whitefin.json +++ b/thermal_info_config_whitefin.json @@ -70,22 +70,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":"battery", "Type":"BATTERY", @@ -102,161 +86,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", - "Combination":[ - "battery", - "battery_cycle", - "smpl_gm" - ], - "Coefficient":[ - "-10000", - "400", - "1400" - ], - "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": "smpl_gm", - "Combination":[ - "battery", - "battery_cycle", - "smpl_gm" - ], - "Coefficient":[ - "-10000", - "400", - "1400" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1400, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", From 121db9afdc9a19eebcfeab27c45a246e9400c84f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 9 Aug 2024 00:08:23 +0000 Subject: [PATCH 20/22] Update raven SVN to 86 Bug: 352170103 Change-Id: I0e619e253903e15d0a3a56b243349ea92c20d041 Flag: EXEMPT bugfix --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index c69116a..e1c2b1b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -201,7 +201,7 @@ ifdef RELEASE_SVN_RAVEN TARGET_SVN ?= $(RELEASE_SVN_RAVEN) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 85 +TARGET_SVN ?= 86 endif PRODUCT_VENDOR_PROPERTIES += \ From d245dbc7aa2478ba0ab1fdccf8e834ac5d856034 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 8 Aug 2024 21:16:22 +0000 Subject: [PATCH 21/22] Update oriole SVN to 86 Bug: 352170103 Change-Id: I7bdd4b0fa902b1b04936ad2a3825331988019d12 Flag: EXEMPT bugfix --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index f852140..e22fb6e 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -197,7 +197,7 @@ ifdef RELEASE_SVN_ORIOLE TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 85 +TARGET_SVN ?= 86 endif PRODUCT_VENDOR_PROPERTIES += \ From 944eebcd15152bae037acfafb378b6be338dcc11 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 14 Aug 2024 08:46:05 +0000 Subject: [PATCH 22/22] thermal:remove unused state2power value Bug: 355566259 Test: Build test Change-Id: Iacb553f7a0106b955709dfa346bbd39fef5253ae Signed-off-by: Peter (YM) --- thermal_info_config_oriole.json | 12 ++++-------- thermal_info_config_oriole_WHI_A.json | 12 ++++-------- thermal_info_config_raven.json | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index be128fa..2a57b61 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -469,26 +469,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"] + "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":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"] + "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":["4406", "3874", "3500", "3052", "2704", "2334", "2176", "1864", "1492", "1362", "1116", "908", "756", "594", "478", "388", "178"] + "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":"fcc", diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json index fa7398d..aa59ee5 100644 --- a/thermal_info_config_oriole_WHI_A.json +++ b/thermal_info_config_oriole_WHI_A.json @@ -717,26 +717,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["420", "332", "268", "212", "176", "148", "108", "80", "56", "24"] + "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":["1216", "1018", "842", "686", "538", "428", "336", "274", "212", "178", "146", "118", "86", "56"] + "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":["2322", "1992", "1674", "1412", "1168", "936", "766", "590", "474", "394", "310", "162"] + "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":["2580", "2033", "1427", "826", "358"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { "Name":"tpu_cooling", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index eecaacf..fe72c6b 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -459,26 +459,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"] + "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":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"] + "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":["4208", "3692", "3370", "2898", "2562", "2240", "2084", "1780", "1424", "1276", "1042", "858", "714", "560", "448", "364", "166"] + "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":"fcc",