From 24776dbb422c32243ac41f76bbd24b40a81ee4bd Mon Sep 17 00:00:00 2001 From: Barry Date: Tue, 5 Mar 2024 09:32:42 +0000 Subject: [PATCH 01/47] BT: set system property for Bluetooth Auto On Set bluetooth.server.automatic_turn_on true for Bluetooth Auto On feature. The feature will be enabled with both system property and flag set. Bug: 328168526 Test: check system property value Change-Id: I53666ac16d6b5526b8f86021a212e00aa32a843b --- device-cheetah.mk | 4 ++++ device-panther.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index eb12309..8f109f2 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -159,6 +159,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Enable Bluetooth AutoOn feature +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.server.automatic_turn_on=true + # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ hci_inject diff --git a/device-panther.mk b/device-panther.mk index bb23a15..39c3178 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -142,6 +142,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Enable Bluetooth AutoOn feature +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.server.automatic_turn_on=true + # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ hci_inject From d91e302cb8032aa906f5bf9a1978e474e54471c3 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 01:53:58 +0000 Subject: [PATCH 02/47] Update cheetah SVN to 51 Bug: 325156176 Change-Id: I25611cbbda7220e6a31afdb348c3fdd5aa87e76d --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 8f109f2..dda9cd9 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -340,7 +340,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=50 + ro.vendor.build.svn=51 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a7f662bf712d428d8bcf17b86939ba00d4c37f2f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 01:25:47 +0000 Subject: [PATCH 03/47] Update panther SVN to 51 Bug: 325156176 Change-Id: I168f901a06afbdc399572e008b5eed839e672975 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 39c3178..f937ef1 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -324,7 +324,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=50 + ro.vendor.build.svn=51 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From d91a3af5da3fd1f545a5f3557efcd52e4cab6ff6 Mon Sep 17 00:00:00 2001 From: Kimi Hsu Date: Thu, 29 Feb 2024 07:23:26 +0000 Subject: [PATCH 04/47] Use rounded corner radius from max resolution Bug: 326046204 Test: try WindowInsets#getRoundedCorner Flag: NONE Change-Id: I93ff91b6147fdf83d4997992ee4102419c1dc386 --- .../overlay/frameworks/base/core/res/res/values/dimens.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml index c99f6cc..5895f36 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -19,9 +19,9 @@ - 50px - 50px - 49px + 67px + 67px + 66px 50px From 1fb85703e6269a37e5962bb88527aeb0a1822717 Mon Sep 17 00:00:00 2001 From: Sam Paradis Date: Thu, 1 Feb 2024 00:55:07 +0000 Subject: [PATCH 05/47] Change FACE_UNLOCK_BOOST to Maximize CPU Frequency This is part of an optimization that limits the length and prevelance of this power hint. Strict, ultra-agression minimizes power and latency versus always-on mid aggression. Bug: 297964952 Change-Id: I9074d616b6f099ff6dc986520d51024c67b81394 --- powerhint-cheetah-a0.json | 16 +++++----------- powerhint-cheetah.json | 16 +++++----------- powerhint-panther-a0.json | 16 +++++----------- powerhint-panther.json | 16 +++++----------- 4 files changed, 20 insertions(+), 44 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 0f8c182..d312541 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -1959,25 +1959,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1826000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 101b43e..e24e207 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2227,25 +2227,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1826000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 5a89a89..c975a07 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -1846,25 +1846,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1826000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/powerhint-panther.json b/powerhint-panther.json index a067b1a..3fe7143 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -2083,25 +2083,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1826000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { From 143dc64058423f62494716725665fd381eb0361c Mon Sep 17 00:00:00 2001 From: Sam Paradis Date: Thu, 1 Feb 2024 00:55:07 +0000 Subject: [PATCH 06/47] Change FACE_UNLOCK_BOOST to Maximize CPU Frequency This is part of an optimization that limits the length and prevelance of this power hint. Strict, ultra-agression minimizes power and latency versus always-on mid aggression. Bug: 297964952 Change-Id: I9074d616b6f099ff6dc986520d51024c67b81394 --- powerhint-cheetah-a0.json | 16 +++++----------- powerhint-cheetah.json | 16 +++++----------- powerhint-panther-a0.json | 16 +++++----------- powerhint-panther.json | 16 +++++----------- 4 files changed, 20 insertions(+), 44 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 0f8c182..d312541 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -1959,25 +1959,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1826000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 101b43e..e24e207 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2227,25 +2227,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1826000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 5a89a89..c975a07 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -1846,25 +1846,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1826000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/powerhint-panther.json b/powerhint-panther.json index a067b1a..3fe7143 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -2083,25 +2083,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1826000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { From 451a78efe027e087e81f0a664798a0d30aac4809 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 01:55:51 +0000 Subject: [PATCH 07/47] Update cheetah SVN to 52 Bug: 325156176 Change-Id: I341ff6be1ea248f796a5c9891c5838aa15607e69 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index dda9cd9..4741cff 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -340,7 +340,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=51 + ro.vendor.build.svn=52 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ffd1cf7b0af8847301cffe1e7717a592b775b194 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 01:46:58 +0000 Subject: [PATCH 08/47] Update panther SVN to 52 Bug: 325156176 Change-Id: I0cd1f134e809508b0b14da5e861f9e944f61fe7e --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index f937ef1..a6cc2d4 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -324,7 +324,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=51 + ro.vendor.build.svn=52 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 655322dd89908374dbc6712a5ea83bcfee5c22a4 Mon Sep 17 00:00:00 2001 From: Nina Chen Date: Fri, 8 Mar 2024 18:34:12 +0800 Subject: [PATCH 09/47] Change the rule to specify kernel directory with release configurations Bug: 326879772 Change-Id: I0c2f5b889daed11d37d1877332a5e75108fb5089 Signed-off-by: Nina Chen --- device-cheetah.mk | 11 ++++++----- device-panther.mk | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4741cff..cbe6d20 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -17,16 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers - ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/pantah-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk) diff --git a/device-panther.mk b/device-panther.mk index a6cc2d4..32c612b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -17,16 +17,17 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers - ifdef RELEASE_GOOGLE_PANTHER_KERNEL_VERSION TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_PANTHER_KERNEL_VERSION) endif ifdef RELEASE_GOOGLE_PANTHER_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/pantah-kernel +TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers endif $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk) From 01f8a2bfb25144b196879d077b51acbaf04c51ae Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 01:58:20 +0000 Subject: [PATCH 10/47] Update cheetah SVN to 53 Bug: 325156176 Change-Id: I33d672ea05098b9eab94c9d390279a32bc22c979 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index cbe6d20..8a17047 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -341,7 +341,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=52 + ro.vendor.build.svn=53 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From c33899b65386c82b93d8c38f943d4679bdf65d50 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 01:50:19 +0000 Subject: [PATCH 11/47] Update panther SVN to 53 Bug: 325156176 Change-Id: I6544997b66f22ab295bab9a6d83780227ea57677 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 32c612b..1ddb441 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -325,7 +325,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=52 + ro.vendor.build.svn=53 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 24f2adefc2e6a2a19291fda23d692cf83d5ec32b Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 21 Mar 2024 18:38:43 +0800 Subject: [PATCH 12/47] Branch bootloader prebuilts for 24Q3 release Bug: 326002225 Change-Id: I90517976d321581238505536fb76899a8bc51317 --- cheetah/BoardConfig.mk | 4 +++- cloudripper/BoardConfig.mk | 4 +++- device-cheetah.mk | 8 ++++++-- device-cloudripper.mk | 4 +++- device-panther.mk | 8 ++++++-- device-ravenclaw.mk | 8 ++++++-- panther/BoardConfig.mk | 4 +++- ravenclaw/BoardConfig.mk | 4 +++- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 645f56c..26a5563 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -20,8 +20,10 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index c5f39fe..39410c9 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -17,8 +17,10 @@ TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/device-cheetah.mk b/device-cheetah.mk index 8a17047..3b81c9c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -290,8 +290,10 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -312,8 +314,10 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 7e59c5c..6f14708 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -157,8 +157,10 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-panther.mk b/device-panther.mk index 1ddb441..f00d129 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -270,8 +270,10 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -296,8 +298,10 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 324bfde..027e87a 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -147,8 +147,10 @@ PRODUCT_SOONG_NAMESPACES += \ GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -170,8 +172,10 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q3 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 1717606..b4ff5a7 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -23,8 +23,10 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 1c21a93..861cc28 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -17,8 +17,10 @@ TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif From be8c769b31a6035a818c1ec3a6bcca57d671c8dc Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 6 Mar 2024 00:54:42 +0000 Subject: [PATCH 13/47] Update panther SVN to 54 Bug: 325156176 Change-Id: I6504290fbf2e72b6022b503455fb455798c7dbf4 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index f00d129..188111f 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -329,7 +329,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=53 + ro.vendor.build.svn=54 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 0664cb1d0993a3999b34943d0fca55cfd8201334 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 6 Mar 2024 00:51:10 +0000 Subject: [PATCH 14/47] Update cheetah SVN to 54 Bug: 325156176 Change-Id: I1aa6b83a8eaf2f6719b0aa534359ec0c4c2f9f69 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3b81c9c..3391bbd 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -345,7 +345,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=53 + ro.vendor.build.svn=54 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From f3272d17c187dbc5bd725efca8cdded1a3e9453f Mon Sep 17 00:00:00 2001 From: vincenttew Date: Wed, 27 Mar 2024 11:57:06 +0800 Subject: [PATCH 15/47] audio: remove non-supported analog headset Bug: 329470379 Change-Id: If6f08a5f800a4c1e5e825fb18c55a321e5a55210 Signed-off-by: vincenttew --- audio/cheetah/config/audio_policy_configuration.xml | 6 ------ audio/panther/config/audio_policy_configuration.xml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml index ffcfc7f..2f32ef5 100644 --- a/audio/cheetah/config/audio_policy_configuration.xml +++ b/audio/cheetah/config/audio_policy_configuration.xml @@ -135,10 +135,6 @@ - - - - @@ -158,8 +154,6 @@ - - - - - - @@ -158,8 +154,6 @@ - - Date: Thu, 14 Mar 2024 16:02:30 +0000 Subject: [PATCH 16/47] powerhint: set uclampmin_init value for applying CPU Load boost Bug: 329483662 Test: Manual Test Change-Id: I4cf8403643f28322f4c3480235e395156a173fad --- powerhint-cheetah.json | 6 +++--- powerhint-cloudripper.json | 6 +++--- powerhint-panther.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index e24e207..2f5a29c 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2310,7 +2310,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -2334,7 +2334,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -2358,7 +2358,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 6d10711..ffad59c 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -1230,7 +1230,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1254,7 +1254,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -1278,7 +1278,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, diff --git a/powerhint-panther.json b/powerhint-panther.json index 3fe7143..c535f0c 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -2166,7 +2166,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 232, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -2190,7 +2190,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, @@ -2214,7 +2214,7 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 162, + "UclampMin_Init": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, From d63ba202a4d0abed7b832055d93a0510fd01939c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 28 Mar 2024 15:31:37 +0000 Subject: [PATCH 17/47] Update cheetah SVN to 55 Bug: 330382848 Change-Id: Icef538751a8e660862b5c33c2ca4cb225adc9071 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 3391bbd..cc33e37 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -345,7 +345,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=54 + ro.vendor.build.svn=55 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 460894bed6e89c1ae88aeba7e4eea4f54ebc606f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 3 Apr 2024 23:09:42 +0000 Subject: [PATCH 18/47] Update cheetah SVN to 56 Bug: 330382848 Change-Id: I26d77ac278f8c6fe05aa705a1f4b8544aef1d26e --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index cc33e37..63b487e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -345,7 +345,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=55 + ro.vendor.build.svn=56 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a77c2c59a62acb04b304e7df8d4a805e0f48c22d Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 28 Mar 2024 15:30:20 +0000 Subject: [PATCH 19/47] Update panther SVN to 55 Bug: 330382848 Change-Id: If7e8fde69fcac194e57df3ac2a39e91fdb0fbbba --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 188111f..68e72c1 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -329,7 +329,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=54 + ro.vendor.build.svn=55 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 6cbb1eb370842cd354f141162edc6f96d7558ac7 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 3 Apr 2024 23:06:03 +0000 Subject: [PATCH 20/47] Update panther SVN to 56 Bug: 330382848 Change-Id: I98175f825b431119d5e5d60e878946e7da2ddacc --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 68e72c1..2f82832 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -329,7 +329,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=55 + ro.vendor.build.svn=56 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 8dd0cda3f70053811a8686e8c23cf20bf73ef519 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Fri, 5 Apr 2024 14:39:03 +0000 Subject: [PATCH 21/47] Enable even dimmer in config Bug: 333054547 Test: atest DisplayServiceTests Change-Id: I9021ce2761de571cd57dc2edee01e30394970104 --- .../core/res/res/values/config_display.xml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 panther/overlay/frameworks/base/core/res/res/values/config_display.xml diff --git a/panther/overlay/frameworks/base/core/res/res/values/config_display.xml b/panther/overlay/frameworks/base/core/res/res/values/config_display.xml new file mode 100644 index 0000000..f4bb470 --- /dev/null +++ b/panther/overlay/frameworks/base/core/res/res/values/config_display.xml @@ -0,0 +1,33 @@ + + + + + + + + + + true + + From 9fcfca366e38fbe9689a70ed5b0a7636cb7484f2 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Wed, 10 Apr 2024 07:15:28 +0000 Subject: [PATCH 22/47] powerhint: set ADPF CPU_LOAD_UP CPU_LOAD_RESET values Bug: 329483662 Test: Manual Test Change-Id: I2db459079b5db2873cac035a68aca25e81d96cd0 --- powerhint-cheetah.json | 24 +++++++++--------------- powerhint-cloudripper.json | 24 +++++++++--------------- powerhint-panther.json | 24 +++++++++--------------- 3 files changed, 27 insertions(+), 45 deletions(-) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 2f5a29c..dea4c7b 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2310,15 +2310,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2334,15 +2334,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2358,15 +2358,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2389,8 +2389,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2413,8 +2411,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2437,8 +2433,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index ffad59c..0808267 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -1230,15 +1230,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0 }, @@ -1254,15 +1254,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0 }, @@ -1278,15 +1278,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0 }, @@ -1309,8 +1309,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1333,8 +1331,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -1357,8 +1353,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } diff --git a/powerhint-panther.json b/powerhint-panther.json index c535f0c..ca1dec2 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -2166,15 +2166,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 232, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2190,15 +2190,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2214,15 +2214,15 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 480, + "UclampMin_Init": 162, + "UclampMin_LoadUp": 480, + "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0 }, @@ -2245,8 +2245,6 @@ "UclampMin_High": 197, "UclampMin_Low": 197, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2269,8 +2267,6 @@ "UclampMin_High": 53, "UclampMin_Low": 53, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 }, @@ -2293,8 +2289,6 @@ "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, - "EarlyBoost_On": false, - "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 } From d0075627817f5bae73a09d8372844a7eebf79d5c Mon Sep 17 00:00:00 2001 From: Barry Date: Thu, 11 Apr 2024 15:20:50 +0000 Subject: [PATCH 23/47] [Bluetooth] Disable BT auto on feature Set bluetooth.server.automatic_turn_on false for disable Bluetooth Auto On feature Bug: 333830114 Test: make Change-Id: Ie76453801925020537c1797e276867f130113af6 --- 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 63b487e..77c1b9e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -162,7 +162,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=true + bluetooth.server.automatic_turn_on=false # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ diff --git a/device-panther.mk b/device-panther.mk index 2f82832..c5886c8 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -145,7 +145,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=true + bluetooth.server.automatic_turn_on=false # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ From 9e5ed00c846869dcab0a8152a82f277fffc6cabb Mon Sep 17 00:00:00 2001 From: isaacchiou Date: Tue, 9 Apr 2024 15:59:08 +0000 Subject: [PATCH 24/47] wifi: disable FW roaming when in idle mode When device is idle, disable FW roaming (LOW RSSI roam, high band roam) to save power Bug: 321639511 Test: Manual Change-Id: I04eed6e22c9574de00aeea161495ad8fc5da1af9 --- cheetah/rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ panther/rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml index 20f6bbc..d80000b 100644 --- a/cheetah/rro_overlays/WifiOverlay/res/values/config.xml +++ b/cheetah/rro_overlays/WifiOverlay/res/values/config.xml @@ -173,4 +173,10 @@ If equals to 0, it means there's no limit on the max number of channels to include per network.--> 3 + + true + diff --git a/panther/rro_overlays/WifiOverlay/res/values/config.xml b/panther/rro_overlays/WifiOverlay/res/values/config.xml index 72b3674..23d08d3 100644 --- a/panther/rro_overlays/WifiOverlay/res/values/config.xml +++ b/panther/rro_overlays/WifiOverlay/res/values/config.xml @@ -173,4 +173,10 @@ If equals to 0, it means there's no limit on the max number of channels to include per network.--> 3 + + true + From 531f24ccf91b4a88f0a96532b017df509ff76951 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Mon, 15 Apr 2024 14:00:15 +0000 Subject: [PATCH 25/47] Revert "Enable even dimmer in config" Revert submission 26833777-even_dimmer_config_panther Reason for revert: b/179428400#comment42 Reverted changes: /q/submissionid:26833777-even_dimmer_config_panther Bug: 179428400 Test: builds Change-Id: Ida35087de0df6f68dc7a78c324b8c68c2432202a --- .../core/res/res/values/config_display.xml | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 panther/overlay/frameworks/base/core/res/res/values/config_display.xml diff --git a/panther/overlay/frameworks/base/core/res/res/values/config_display.xml b/panther/overlay/frameworks/base/core/res/res/values/config_display.xml deleted file mode 100644 index f4bb470..0000000 --- a/panther/overlay/frameworks/base/core/res/res/values/config_display.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - true - - From f4b6265c47b63a763a2ceba209e233627de658f2 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 2 Apr 2024 16:45:00 +0800 Subject: [PATCH 26/47] Switch default kernel directory and change build flag naming Bug: 309749142 Change-Id: Ie60ac44eff9b00b8183a2d9f7819e6e6ce52336d --- device-cheetah.mk | 14 +++----------- device-cloudripper.mk | 5 +++-- device-panther.mk | 14 +++----------- device-ravenclaw.mk | 5 +++-- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 77c1b9e..ecf1b42 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -17,18 +17,10 @@ # 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_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_CHEETAH_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_CHEETAH_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CHEETAH_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cheetah.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 6f14708..579133a 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -17,8 +17,9 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-cloudripper.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) diff --git a/device-panther.mk b/device-panther.mk index c5886c8..71874b9 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -17,18 +17,10 @@ # 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_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_PANTHER_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_PANTHER_KERNEL_DIR +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION) # Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_PANTHER_KERNEL_DIR)/kernel-headers -else -TARGET_KERNEL_DIR ?= device/google/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/pantah-kernel/kernel-headers -endif +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_PANTHER_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-panther.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 027e87a..a0ccfba 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -17,8 +17,9 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/pantah-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/pantah-kernel/kernel-headers +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers $(call inherit-product-if-exists, vendor/google_devices/pantah/prebuilts/device-vendor-ravenclaw.mk) $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk) From f2140ea87306a4da8fcb3332fd644210fa224f24 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 18 Apr 2024 16:01:02 +0800 Subject: [PATCH 27/47] Switch bootloader directory to control by build flag Bug: 333834221 Change-Id: I045c65830b8c04dff0720e509108659d45a400ac --- cheetah/BoardConfig.mk | 12 +++--------- cloudripper/BoardConfig.mk | 12 +++--------- device-cheetah.mk | 18 ------------------ device-cloudripper.mk | 9 --------- device-panther.mk | 18 ------------------ device-ravenclaw.mk | 18 ------------------ panther/BoardConfig.mk | 12 +++--------- ravenclaw/BoardConfig.mk | 12 +++--------- 8 files changed, 12 insertions(+), 99 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 26a5563..e2b74b6 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -18,15 +18,9 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index 39410c9..33e7706 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,15 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) 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 ecf1b42..d843668 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -280,15 +280,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk -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) @@ -304,15 +295,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk -endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 579133a..4286433 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -156,15 +156,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk -endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-panther.mk b/device-panther.mk index 71874b9..8919ae2 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -260,15 +260,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk -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) @@ -288,15 +279,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk -endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index a0ccfba..19f0afc 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -146,15 +146,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk -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) @@ -171,15 +162,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q3 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk -endif # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index b4ff5a7..69ca934 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -21,15 +21,9 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)) ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 861cc28..722dbc6 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,15 +15,9 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR) +$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true From 7d5f8c19332439582da6507f5a08f21a20932570 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 24 Apr 2024 23:13:10 +0000 Subject: [PATCH 28/47] Update panther SVN to 57 Bug: 336526332 Change-Id: I8233e9b89083f85341e7c1d981c53e81d26fe279 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 8919ae2..bc47cc9 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=56 + ro.vendor.build.svn=57 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 10a2c648294e0c3dffb065fef94cfbf0a14fe5aa Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 24 Apr 2024 23:18:29 +0000 Subject: [PATCH 29/47] Update panther SVN to 58 Bug: 336526332 Change-Id: I677aa3bb859c50b2821659f5a1aa12b4763e7cda --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index bc47cc9..b60f1e5 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=57 + ro.vendor.build.svn=58 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From b843fb4c09cb1129b3ff0c2de96fe2bc3e5c70cb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 24 Apr 2024 23:11:11 +0000 Subject: [PATCH 30/47] Update cheetah SVN to 57 Bug: 336526332 Change-Id: Ib3b9baf24d3f0d5622ae63f11aa564df35fd14df --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index d843668..7f2e812 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -319,7 +319,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=56 + ro.vendor.build.svn=57 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a1384a5913a0360a870775ccd7ca85c1185493ea Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 25 Apr 2024 03:33:50 +0000 Subject: [PATCH 31/47] Update cheetah SVN to 58 Bug: 336526332 Change-Id: I58310564b2715e78e0b11871bad908d8a00e9866 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 7f2e812..34ac2b6 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -319,7 +319,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=57 + ro.vendor.build.svn=58 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ce2c6373239ac5cec8f9b148ad7297152960f2f3 Mon Sep 17 00:00:00 2001 From: Thomas Girardier Date: Thu, 25 Apr 2024 16:21:17 +0000 Subject: [PATCH 32/47] Revert "[Bluetooth] Disable BT auto on feature" Revert submission 26919210-BTAUTOOFF4389 Reason for revert: Auto On has been approved for 24Q3 Reverted changes: /q/submissionid:26919210-BTAUTOOFF4389 Change-Id: I686da7dc94d49c37741b238fe6b35b49a131a523 --- 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 34ac2b6..eb60d38 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -154,7 +154,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=false + bluetooth.server.automatic_turn_on=true # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ diff --git a/device-panther.mk b/device-panther.mk index b60f1e5..d1d279e 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -137,7 +137,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.server.automatic_turn_on=false + bluetooth.server.automatic_turn_on=true # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ From 98638e51bbdb749fb3084bcaebd5a63379d986b1 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 7 Apr 2023 23:12:04 +0000 Subject: [PATCH 33/47] Add POWER_EFFICIENCY uclamp max to adpf config Add the "UclampMax_EfficientBase" value to the ADPF config in the powerhint.json to specify efficient core scheduling in the static case, and "UclampMax_EfficientOffset" for the dynamic case, for this device. Bug: 277285195 Test: manual Change-Id: I5b0573dd07dc6b4725236ed8e9825594cfece880 --- 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 ++++++++++++ 6 files changed, 72 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index d312541..1bb391d 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -2117,6 +2117,8 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2141,6 +2143,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2165,6 +2169,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2192,6 +2198,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2216,6 +2224,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2240,6 +2250,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index dea4c7b..ad42ffc 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2315,6 +2315,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2339,6 +2341,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2363,6 +2367,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2388,6 +2394,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -2410,6 +2418,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -2432,6 +2442,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 0808267..9a472ad 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -1235,6 +1235,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1259,6 +1261,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1283,6 +1287,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1308,6 +1314,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -1330,6 +1338,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -1352,6 +1362,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index c975a07..bf95ca5 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -2004,6 +2004,8 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2028,6 +2030,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2052,6 +2056,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2079,6 +2085,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2103,6 +2111,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2127,6 +2137,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, diff --git a/powerhint-panther.json b/powerhint-panther.json index ca1dec2..6d9bd36 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -2171,6 +2171,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2195,6 +2197,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2219,6 +2223,8 @@ "UclampMin_LoadReset": 480, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2244,6 +2250,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -2266,6 +2274,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 @@ -2288,6 +2298,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "TargetTimeFactor": 1.0, "StaleTimeFactor": 5.0 diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index d01f39c..b67b489 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -1233,6 +1233,8 @@ "UclampMin_Init": 232, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1257,6 +1259,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1281,6 +1285,8 @@ "UclampMin_Init": 162, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -1308,6 +1314,8 @@ "UclampMin_Init": 250, "UclampMin_High": 197, "UclampMin_Low": 197, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1332,6 +1340,8 @@ "UclampMin_Init": 250, "UclampMin_High": 53, "UclampMin_Low": 53, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1356,6 +1366,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, From 03102638533ca5866033bfc27cea3fea9f14f5e7 Mon Sep 17 00:00:00 2001 From: Benson Li Date: Mon, 15 Apr 2024 12:38:01 +0000 Subject: [PATCH 34/47] Add system property for concurrent encryption on LE and BR/EDR Bug: 330704060 Change-Id: Ibe6ce2c316f03647da4f23cec5ea095887af5119 Test: make --- device-cheetah.mk | 4 ++++ device-panther.mk | 3 +++ 2 files changed, 7 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index eb60d38..4dd9a2b 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -224,6 +224,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool diff --git a/device-panther.mk b/device-panther.mk index d1d279e..6bf3758 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -194,6 +194,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510 +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ From a0e0cfed6f7eda709f55b52c65d7c2f83620dc2f Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Thu, 2 May 2024 21:07:55 +0800 Subject: [PATCH 35/47] Load fips140.ko before all other kernel modules Bug: 337838109 Bug: 331791671 Change-Id: I85eae3b1d0d8256fd5a1f8e8a2c21b4e00103967 Signed-off-by: Qian-Hao Huang --- cheetah/BoardConfig.mk | 1 + panther/BoardConfig.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index e2b74b6..f3939a1 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -23,6 +23,7 @@ RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ $(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)) # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index 69ca934..2d2b54f 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -18,6 +18,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +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) From c94007596dc8b8952eea3e18104f888079d51856 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Sat, 27 Apr 2024 00:30:45 +0000 Subject: [PATCH 36/47] Increase Mid Core frequency for Capture to 1.6GHz for cheetah and panther Bug: 336071557 Test: https://docs.google.com/spreadsheets/d/1yjLAloiDPrCAO9O1B5sVQa-v4b1S9skeTaFJWVuOj50/edit?resourcekey=0-c3IWVSgzBJHf1ZsvCWC5KA#gid=1194496805 Change-Id: Ic37228fa62d58761865675dcf36bf207794ea580 --- powerhint-cheetah-a0.json | 2 +- powerhint-cheetah.json | 2 +- powerhint-panther-a0.json | 2 +- powerhint-panther.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 1bb391d..3b4a280 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -933,7 +933,7 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 2500, - "Value": "1197000" + "Value": "1663000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index ad42ffc..d6a9237 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -1057,7 +1057,7 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 2500, - "Value": "1197000" + "Value": "1663000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index bf95ca5..401117a 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -922,7 +922,7 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 2500, - "Value": "1197000" + "Value": "1663000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", diff --git a/powerhint-panther.json b/powerhint-panther.json index 6d9bd36..757a1b9 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -1015,7 +1015,7 @@ "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "CPUMidClusterMaxFreq", "Duration": 2500, - "Value": "1197000" + "Value": "1663000" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", From 6db43a538fd48afbfda9cd8ced5cb469e2335deb Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Mon, 6 May 2024 14:30:57 +0000 Subject: [PATCH 37/47] gps: Reduce logging mask Bug: 267729515 Bug: 312716075 Test: Verification for logging system and Gnss function. Test: Verification at b/267729515#comment152. Change-Id: Ibee52c133c72f823013025b151e59a4de8adc4da --- location/gps.xml | 2 +- location/gps.xml.c10 | 2 +- location/gps.xml.p10 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index c17d9b6..cda0fd0 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -70,7 +70,7 @@ Date: Wed, 1 May 2024 18:19:05 +0800 Subject: [PATCH 38/47] Update bootloader pdk folder and soong config Bug: 333834221 Change-Id: I0f26803489893fa33e5ef440b33a3ff0a3b79fc6 --- cheetah/BoardConfig.mk | 9 +++++++-- cloudripper/BoardConfig.mk | 9 +++++++-- panther/BoardConfig.mk | 9 +++++++-- ravenclaw/BoardConfig.mk | 9 +++++++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index f3939a1..6f7f2d5 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -18,9 +18,14 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +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,bootloader,prebuilt_dir,$(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 diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index 33e7706..d923b44 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,9 +15,14 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := cloudripper -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +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,bootloader,prebuilt_dir,$(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/panther/BoardConfig.mk b/panther/BoardConfig.mk index 2d2b54f..34c72d7 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -22,9 +22,14 @@ 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 ?= trunk # Keep this for pdk TODO: b/327119000 +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,bootloader,prebuilt_dir,$(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 diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index 722dbc6..0ead4dc 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,9 +15,14 @@ # TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := ravenclaw -RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= trunk # Keep this for pdk TODO: b/327119000 +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,bootloader,prebuilt_dir,$(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 7b7ee45c08d9daaa7063bfde50a7dace16ba984a Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 16 May 2024 21:13:01 +0000 Subject: [PATCH 39/47] Adpf:pantah: enable heuristic boost. Heuristic boost will adjust the ADPF boost profile when the powerhal detects the power session is very janky, providing more boost for deadline sensitive threads managered in the session. Bug: 341111433 Test: adb shell dumpsys android.hardware.power.IPower/default; Check the device adpf sessions' traces. Change-Id: I48b6e6fe32e99e8263d9fb73734cf423e40247e8 --- 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, 180 insertions(+), 18 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 3b4a280..a6bcdf0 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -2126,7 +2126,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2152,7 +2161,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2178,7 +2196,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index d6a9237..8dac037 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -2322,7 +2322,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2348,7 +2357,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2374,7 +2392,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 9a472ad..856de7a 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -1242,7 +1242,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1268,7 +1277,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1294,7 +1312,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 401117a..de5ee4e 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -2013,7 +2013,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2039,7 +2048,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2065,7 +2083,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-panther.json b/powerhint-panther.json index 757a1b9..e87a278 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -2178,7 +2178,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 83333330, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -2204,7 +2213,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 111111110, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -2230,7 +2248,16 @@ "SamplingWindow_D": 1, "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 15.0 + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index b67b489..269bd21 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -1242,7 +1242,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_90FPS", @@ -1268,7 +1277,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "REFRESH_60FPS", @@ -1294,7 +1312,16 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 20.0, + "HeuristicBoost_On": true, + "HBoostOnMissedCycles": 8, + "HBoostOffMaxAvgRatio": 4.0, + "HBoostOffMissedCycles": 5, + "HBoostPidPuFactor": 0.5, + "HBoostUclampMin": 722, + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300 }, { "Name": "UiHighBoostWithoutPid", From cbb6d79e902452f4d432582262f7429d3fcde58e Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Mon, 13 May 2024 08:40:59 +0000 Subject: [PATCH 40/47] Vibrator: Set Soong Config variable - kernel_ver Bug: 340148508 Test: Build and check fw files in all devices. Change-Id: I948917e2b051dc66a060b732ae2eeeceae3b7bbd --- device-cheetah.mk | 1 + device-cloudripper.mk | 3 +++ device-panther.mk | 1 + 3 files changed, 5 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4dd9a2b..895dd8f 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -356,6 +356,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 4286433..723d350 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -182,3 +182,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) diff --git a/device-panther.mk b/device-panther.mk index 6bf3758..2ba1948 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -341,6 +341,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ From 60b4e5b2cd3b973c384008cf0914b3da6b6cb4c3 Mon Sep 17 00:00:00 2001 From: samou Date: Wed, 15 May 2024 11:51:12 +0000 Subject: [PATCH 41/47] thermal: Remove SOFT_OCP related tzones Bug: 337976702 Test: Confirm boot Change-Id: I1f26231452a31b0e3940e98531b384f4e31928cb Signed-off-by: samou --- thermal_info_config_cheetah.json | 30 --------- thermal_info_config_cloudripper.json | 96 ---------------------------- thermal_info_config_panther.json | 30 --------- thermal_info_config_ravenclaw.json | 96 ---------------------------- 4 files changed, 252 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index aeba547..e649bc6 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -715,36 +715,6 @@ "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":"soft_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 - }, - { - "Name":"soft_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 - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true } ], "CoolingDevices":[ diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json index a597fac..aed1512 100644 --- a/thermal_info_config_cloudripper.json +++ b/thermal_info_config_cloudripper.json @@ -437,102 +437,6 @@ "VrThreshold":"NAN", "Multiplier":1 }, - { - "Name":"soft_ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_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":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "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 553b33e..d89803f 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -716,36 +716,6 @@ "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":"soft_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 - }, - { - "Name":"soft_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 - }, - { - "Name":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true } ], "CoolingDevices":[ diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json index 26e5dbd..327f033 100644 --- a/thermal_info_config_ravenclaw.json +++ b/thermal_info_config_ravenclaw.json @@ -639,102 +639,6 @@ "VrThreshold":"NAN", "Multiplier":1 }, - { - "Name":"soft_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":"soft_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":"soft_ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, - { - "Name":"soft_ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", - "Multiplier":1 - }, { "Name":"TPU", "Type":"NPU", From ab92c7917fb7a1a24a9b4c1d5a214625d419a305 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Sat, 27 Apr 2024 01:54:50 +0800 Subject: [PATCH 42/47] audio: remove unused device Bug: 337191827 Test: build pass Change-Id: Ia3e13839cd8680a09637c64067bba21b1b74aa2d Signed-off-by: Carter Hsu --- audio/cheetah/config/audio_policy_configuration.xml | 2 -- .../audio_policy_configuration_a2dp_offload_disabled.xml | 8 -------- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 8 -------- .../audio_policy_configuration_le_offload_disabled.xml | 8 -------- audio/panther/config/audio_policy_configuration.xml | 2 -- .../audio_policy_configuration_a2dp_offload_disabled.xml | 8 -------- .../audio_policy_configuration_bluetooth_legacy_hal.xml | 8 -------- .../audio_policy_configuration_le_offload_disabled.xml | 8 -------- 8 files changed, 52 deletions(-) diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml index 2f32ef5..dde76b6 100644 --- a/audio/cheetah/config/audio_policy_configuration.xml +++ b/audio/cheetah/config/audio_policy_configuration.xml @@ -145,8 +145,6 @@ - - diff --git a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml index 0f38000..a9c2450 100644 --- a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - diff --git a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml index efd85b1..db23991 100644 --- a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml index 833ba9e..6df42f7 100644 --- a/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/cheetah/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - - - diff --git a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml index 0f38000..a9c2450 100644 --- a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - diff --git a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml index efd85b1..db23991 100644 --- a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -145,8 +141,6 @@ - - @@ -154,8 +148,6 @@ - - diff --git a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml index 833ba9e..6df42f7 100644 --- a/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/panther/config/audio_policy_configuration_le_offload_disabled.xml @@ -135,10 +135,6 @@ - - - - @@ -149,8 +145,6 @@ - - @@ -158,8 +152,6 @@ - - Date: Thu, 30 May 2024 00:00:55 +0000 Subject: [PATCH 43/47] Update panther SVN to 59 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c58b2daccaa7f26d6b18392dae83de68ee4de7b6) Merged-In: Idd25f5c1fa8da8a7bb045dac0a81f267ecbb556d 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 8dda41d0727863c6c2140ec08212ae7f96cf2f67 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 23:40:20 +0000 Subject: [PATCH 44/47] Update cheetah SVN to 59 Bug: 342381152 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6afe8e8885f071bb13d3c2d644cff5f1c940f58f) Merged-In: I6ccef90e6b26a686c825b25be1b3b9bbacc80cba 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 c517d85f6b3087ee6e9f118316d199173b8fd4e6 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:10:05 +0000 Subject: [PATCH 45/47] pantah: Use build_flags for SVN Flag: build.RELEASE_SVN_CHEETAH Flag: build.RELEASE_SVN_PANTHER Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5d8a141aad34e31a92efd57ae9e8398eed1417e4) Merged-In: I97d624c43e943e2dc21efc2edb8360c43a4e48aa 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 bb3e030..ddeb077 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -322,8 +322,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 091ce97..803262c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -305,8 +305,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 2e63019b4ade7c3601f9949da1ce201ad62122cd Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 13:48:25 +0000 Subject: [PATCH 46/47] Update cheetah SVN to 60 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cf3cc4a874e817fb330988d982866183eba79208) Merged-In: Id9033d8d37de66bbb238aead0dbf7f380f4f9d10 Change-Id: Id9033d8d37de66bbb238aead0dbf7f380f4f9d10 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ddeb077..06adb3d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -326,7 +326,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 270793f2d609c552747750a061bc0bca6f3ccc23 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Mon, 15 Jul 2024 13:58:25 +0000 Subject: [PATCH 47/47] Update panther SVN to 60 Bug: 352170103 Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cc435349480d6fbffc45c130fe934bb2894b9e76) Merged-In: I5793f3fcbd31221a8c47658ad00629bcbf704bc0 Change-Id: I5793f3fcbd31221a8c47658ad00629bcbf704bc0 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 803262c..88a2305 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -309,7 +309,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 += \