From 4d413feeacb5ada8419afddbbbce127bfd5233cb Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 17 Feb 2023 14:47:49 -0800 Subject: [PATCH 01/58] dck: add SE capability property Bug: 229777047 Test: boot cheetah; check logs to see that SE property is used Signed-off-by: Jeffrey Carlyle Change-Id: I4b6a168dde62ec311ca1f392101335977ca70f32 --- device-cheetah.mk | 3 ++- device-panther.mk | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 4307d39..a7f7ba8 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -304,7 +304,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=3 + ro.gms.dck.eligible_wcc=3 \ + ro.gms.dck.se_capability=1 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-panther.mk b/device-panther.mk index 5f745e3..1c5eea4 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -289,7 +289,9 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=2 + ro.gms.dck.eligible_wcc=2 \ + ro.gms.dck.se_capability=1 + # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From c975e5e7752aeba7e168611207bacc721b6118dd Mon Sep 17 00:00:00 2001 From: Sal Savage Date: Fri, 17 Mar 2023 12:33:08 -0700 Subject: [PATCH 02/58] Use default assignment operator for LE Audio profile properties Since there's no other assignment currently (default value with no assignment is false) and other targets built on top of phones want to override these profile settings, we'll change the assignment operator used for the properties to "?=". This way, others can use "=" to override. Tag: #stability Bug: 274015277 Test: build and flash, observe no more build errors Change-Id: I1c1b656bd17b4da574e41a404289b974030fd2f5 --- device-cheetah.mk | 12 ++++++------ device-panther.mk | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 220cd8d..993bbfd 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -194,12 +194,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true \ - bluetooth.profile.bap.unicast.client.enabled=true \ - bluetooth.profile.csip.set_coordinator.enabled=true \ - bluetooth.profile.hap.client.enabled=true \ - bluetooth.profile.mcp.server.enabled=true \ - bluetooth.profile.ccp.server.enabled=true \ - bluetooth.profile.vcp.controller.enabled=true \ + bluetooth.profile.bap.unicast.client.enabled?=true \ + bluetooth.profile.csip.set_coordinator.enabled?=true \ + bluetooth.profile.hap.client.enabled?=true \ + bluetooth.profile.mcp.server.enabled?=true \ + bluetooth.profile.ccp.server.enabled?=true \ + bluetooth.profile.vcp.controller.enabled?=true \ # Bluetooth LE Audio CIS handover to SCO # Set the property only if the controller doesn't support CIS and SCO diff --git a/device-panther.mk b/device-panther.mk index e0ed46e..b5b2f83 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -166,12 +166,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ persist.bluetooth.leaudio_offload.disabled=false \ ro.bluetooth.leaudio_switcher.supported=true \ - bluetooth.profile.bap.unicast.client.enabled=true \ - bluetooth.profile.csip.set_coordinator.enabled=true \ - bluetooth.profile.hap.client.enabled=true \ - bluetooth.profile.mcp.server.enabled=true \ - bluetooth.profile.ccp.server.enabled=true \ - bluetooth.profile.vcp.controller.enabled=true \ + bluetooth.profile.bap.unicast.client.enabled?=true \ + bluetooth.profile.csip.set_coordinator.enabled?=true \ + bluetooth.profile.hap.client.enabled?=true \ + bluetooth.profile.mcp.server.enabled?=true \ + bluetooth.profile.ccp.server.enabled?=true \ + bluetooth.profile.vcp.controller.enabled?=true \ # Bluetooth LE Audio CIS handover to SCO # Set the property only if the controller doesn't support CIS and SCO From 0701e32750492ecd5cc256200e82328354e597cd Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 14 Apr 2023 09:44:58 -0700 Subject: [PATCH 03/58] Speed up cheetah, cloudripper, pantherand ravenclaw builds by excluding code that can never be used. Uses the new PRODUCT_SOURCE_ROOT_DIRS flag, and the file list for pixel in vendor/google/products/sources_pixel.mk Test: treehugger, abtd for the relevant buidls Change-Id: I7d509f93e41aa6018ad597da2da8157b20bce755 --- device-cheetah.mk | 3 +++ device-cloudripper.mk | 3 +++ device-panther.mk | 3 +++ device-ravenclaw.mk | 3 +++ 4 files changed, 12 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 07827be..903e4ec 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# 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 diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 447bf2a..92d73b2 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# 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 diff --git a/device-panther.mk b/device-panther.mk index deb68b5..0509d9d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# 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 diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index b3607e7..311b568 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# 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 From 3455842da43ece16e1fdd124ee4d7dbe70e42e1f Mon Sep 17 00:00:00 2001 From: chenkris Date: Thu, 8 Jun 2023 09:56:28 +0000 Subject: [PATCH 04/58] Move goodix mk files from device/google/gs101 to vendor/goodix/udfps Bug: 270657514 Test: build Change-Id: I0d679b948081dfe184c4a2ed7f6f7aa5c5f6a5e9 --- device-cheetah.mk | 6 +++--- device-panther.mk | 6 +++--- device-ravenclaw.mk | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 7e1c0e3..9d0522d 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -270,11 +270,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk +include vendor/goodix/udfps/configuration/udfps_common.mk ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +include vendor/goodix/udfps/configuration/udfps_shipping.mk else -include device/google/gs101/fingerprint/udfps_factory.mk +include vendor/goodix/udfps/configuration/udfps_factory.mk endif PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index 52e7949..4866234 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -251,11 +251,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk +include vendor/goodix/udfps/configuration/udfps_common.mk ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +include vendor/goodix/udfps/configuration/udfps_shipping.mk else -include device/google/gs101/fingerprint/udfps_factory.mk +include vendor/goodix/udfps/configuration/udfps_factory.mk endif # Display diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 311b568..83997f6 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -145,11 +145,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -include device/google/gs101/fingerprint/udfps_common.mk +include vendor/goodix/udfps/configuration/udfps_common.mk ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +include vendor/goodix/udfps/configuration/udfps_shipping.mk else -include device/google/gs101/fingerprint/udfps_factory.mk +include vendor/goodix/udfps/configuration/udfps_factory.mk endif # WiFi Overlay From b4a33eb5c50308e1cea8f26a8eeadb21f1dd8639 Mon Sep 17 00:00:00 2001 From: chenkris Date: Tue, 13 Jun 2023 02:37:18 +0000 Subject: [PATCH 05/58] udfps: fix BB on git_master-without-vendor Bug: 286774587 Test: Build Change-Id: Ide3f7f1fc29f6050d5e1df8940b2992871f547de --- device-cheetah.mk | 6 +++--- device-panther.mk | 6 +++--- device-ravenclaw.mk | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 9d0522d..3ef96fa 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -270,11 +270,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include vendor/goodix/udfps/configuration/udfps_common.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include vendor/goodix/udfps/configuration/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include vendor/goodix/udfps/configuration/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index 4866234..13f8e30 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -251,11 +251,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include vendor/goodix/udfps/configuration/udfps_common.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include vendor/goodix/udfps/configuration/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include vendor/goodix/udfps/configuration/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # Display diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 83997f6..983d166 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -145,11 +145,11 @@ PRODUCT_SOONG_NAMESPACES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty -include vendor/goodix/udfps/configuration/udfps_common.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include vendor/goodix/udfps/configuration/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include vendor/goodix/udfps/configuration/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # WiFi Overlay From a8c07794e4d3c7f414eaa410d03e13aba311ddfe Mon Sep 17 00:00:00 2001 From: Max Bires Date: Wed, 21 Jun 2023 16:26:04 -0700 Subject: [PATCH 06/58] Remove deprecated enable_rkpd property The enable_rkpd property is no longer needed. This change removes the vestigial property. Test: Successful build Change-Id: Ia0989f92a0af4a16418e6fd6ba7054cd9038734e --- device-cheetah.mk | 1 - device-panther.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 485a018..939b8ac 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -366,7 +366,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # RKPD PRODUCT_PRODUCT_PROPERTIES += \ - remote_provisioning.enable_rkpd=true \ remote_provisioning.hostname=remoteprovisioning.googleapis.com \ ##Audio Vendor property diff --git a/device-panther.mk b/device-panther.mk index 8133d80..e834d47 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -350,7 +350,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # RKPD PRODUCT_PRODUCT_PROPERTIES += \ - remote_provisioning.enable_rkpd=true \ remote_provisioning.hostname=remoteprovisioning.googleapis.com \ ##Audio Vendor property From 8f4740a44d2bfffdb009f9f21fe012a55a20c610 Mon Sep 17 00:00:00 2001 From: Nathan Kulczak Date: Tue, 15 Aug 2023 01:08:34 +0000 Subject: [PATCH 07/58] pantah/vibrator: Disable PWLE by default Set chirp.enabled prop to 0 by default so that it will not cause tests to fail. Change prop to persist from ro so that it can be enabled for testing. Bug: 286921585 Test: Tried using idlcli composePwle before/after setting prop Change-Id: Ia0f13d5ebda16dae260a606d0b7c98b6e5e64a5d Signed-off-by: Nathan Kulczak --- 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 e94d12e..14c76e2 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -348,7 +348,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=1 \ + persist.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.214 \ ro.vendor.vibrator.hal.loc.coeff=2.7 diff --git a/device-panther.mk b/device-panther.mk index 9989cb4..712c960 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -335,7 +335,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=1 \ + persist.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.195 \ ro.vendor.vibrator.hal.loc.coeff=2.65 # Keyboard bottom padding in dp for portrait mode and height ratio From 0737e3e9af6c923b8a6b8a1a4b181716bfbd5a87 Mon Sep 17 00:00:00 2001 From: Yung Ti Su Date: Wed, 27 Sep 2023 08:52:36 +0000 Subject: [PATCH 08/58] add mixer path for BLE Bug: 302270637 Test: manual Change-Id: Ic294e7f9e7606fcc8fe00427149c82f7c9310630 Signed-off-by: Yung Ti Su --- .../cheetah/aidl_config/mixer_paths_aidl.xml | 92 +++++++++++++++++++ .../panther/aidl_config/mixer_paths_aidl.xml | 92 +++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml index bb9574b..6a766b1 100644 --- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml +++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml @@ -404,6 +404,14 @@ + + + + + + + + @@ -464,6 +472,14 @@ + + + + + + + + @@ -524,6 +540,14 @@ + + + + + + + + @@ -589,6 +613,14 @@ + + + + + + + + @@ -649,6 +681,14 @@ + + + + + + + + @@ -721,6 +761,14 @@ + + + + + + + + @@ -831,6 +879,14 @@ + + + + + + + + @@ -865,6 +921,14 @@ + + + + + + + + @@ -889,6 +953,10 @@ + + + + @@ -913,6 +981,10 @@ + + + + @@ -947,6 +1019,14 @@ + + + + + + + + @@ -987,6 +1067,10 @@ + + + + @@ -1051,6 +1135,10 @@ + + + + @@ -1220,6 +1308,10 @@ + + + + diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml index bb9574b..6a766b1 100644 --- a/audio/panther/aidl_config/mixer_paths_aidl.xml +++ b/audio/panther/aidl_config/mixer_paths_aidl.xml @@ -404,6 +404,14 @@ + + + + + + + + @@ -464,6 +472,14 @@ + + + + + + + + @@ -524,6 +540,14 @@ + + + + + + + + @@ -589,6 +613,14 @@ + + + + + + + + @@ -649,6 +681,14 @@ + + + + + + + + @@ -721,6 +761,14 @@ + + + + + + + + @@ -831,6 +879,14 @@ + + + + + + + + @@ -865,6 +921,14 @@ + + + + + + + + @@ -889,6 +953,10 @@ + + + + @@ -913,6 +981,10 @@ + + + + @@ -947,6 +1019,14 @@ + + + + + + + + @@ -987,6 +1067,10 @@ + + + + @@ -1051,6 +1135,10 @@ + + + + @@ -1220,6 +1308,10 @@ + + + + From cd6d184b92370ef786d9e0b9824be08c1bff69c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 28 Sep 2023 00:28:57 +0000 Subject: [PATCH 09/58] OWNERS: master -> main Change-Id: I5667801a3f7a11dcefbdfe64ff855957025f42f1 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 61b3e45..e434a1c 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS From 43539b6c4f7220b8648ec7a7107b1f6b21ccfb23 Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Mon, 18 Sep 2023 10:09:14 +0800 Subject: [PATCH 10/58] powerhint: Add DISPLAY_CHANGE hint Add DISPLAY_CHANGE hint for display layout change due to rotation or switching between inner and outer panels. Bug: 298150450 Test: build pass Change-Id: I5c4329ed57da200b21ed92d7626979cc666ae091 --- powerhint-cheetah.json | 65 ++++++++++++++++++++++++++++++++++++++++++ powerhint-panther.json | 54 +++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 618d59a..1457ed4 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -780,6 +780,71 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUMinFreq", diff --git a/powerhint-panther.json b/powerhint-panther.json index 849ef07..65b5352 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -749,6 +749,60 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUMinFreq", From 21bd48a5d51f395718cfc7e4bce131f4ca15d451 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 4 Oct 2023 04:29:08 +0800 Subject: [PATCH 11/58] Add support 48_2 capability for LE audio HW offload Bug: 300788009 Test: manual test in UPF Change-Id: I917de13ae7652e318d6ebff28c5080d156aa7541 --- bluetooth/le_audio_codec_capabilities.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index 89d0de6..5853138 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -32,6 +32,9 @@ + + + @@ -57,6 +60,9 @@ + + + @@ -68,6 +74,7 @@ + From 8245e1e32b107d02e751d6d5342ae389e53a7382 Mon Sep 17 00:00:00 2001 From: ClintChen Date: Tue, 3 Oct 2023 10:59:55 +0000 Subject: [PATCH 12/58] P22: Enable build flag versioning for radio and bootloader Bug: 301142125 Change-Id: Ic446d70e68217ba3354588741206a957033d25fb --- cheetah/BoardConfig.mk | 3 +++ panther/BoardConfig.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 5880d5b..66bf1a4 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -17,6 +17,9 @@ # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_CHEETAH_BOOTLOADER_DIR) + # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index d8b7444..c11cb43 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -20,6 +20,9 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_PANTHER_BOOTLOADER_DIR) + ifdef PHONE_CAR_BOARD_PRODUCT include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else From 2527249c2a591acd5f4f68a91aadee20ff438686 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 9 Oct 2023 19:56:38 +0000 Subject: [PATCH 13/58] pantah: Replace NFC app with NFC apex Bug: 303286040 Test: Compiles (cherry picked from https://android-review.googlesource.com/q/commit:2811f6204de902a7b462078ffb23167351d572a3) Merged-In: Ifb1a5c4f685818fbfe816342e44487aa76528078 Change-Id: Ifb1a5c4f685818fbfe816342e44487aa76528078 --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- device-ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ded4b92..fe8e1b1 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -111,7 +111,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st diff --git a/device-cloudripper.mk b/device-cloudripper.mk index cb3836a..b3ef294 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index fe09ca7..478ea7c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -90,7 +90,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 983d166..7b56e1a 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st From 6a6fcf80f8e0bf4812521d63b415e5072c6f4101 Mon Sep 17 00:00:00 2001 From: guibing Date: Wed, 2 Aug 2023 17:38:07 +0000 Subject: [PATCH 14/58] powerhint: pantah: update vendor_sched procfs paths Vendor sched procfs path hierarchy gets updated in kernel. Update the paths in powerhint json file to match the change. Bug: 289151587 Test: UIbench ab tests. Change-Id: I893227550c63f4b2f52e651c4302b171cdacbb5b --- powerhint-cheetah-a0.json | 18 +++++++++--------- powerhint-cheetah.json | 20 ++++++++++---------- powerhint-cloudripper.json | 14 +++++++------- powerhint-panther-a0.json | 18 +++++++++--------- powerhint-panther.json | 20 ++++++++++---------- powerhint-ravenclaw.json | 14 +++++++------- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 665c384..411c7fb 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -159,7 +159,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -168,7 +168,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1", @@ -178,7 +178,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -187,7 +187,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -206,7 +206,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -255,7 +255,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -264,7 +264,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -273,7 +273,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -283,7 +283,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 1457ed4..4d6c413 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -177,7 +177,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -186,7 +186,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1" @@ -195,7 +195,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -204,7 +204,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -223,7 +223,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -272,7 +272,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -281,7 +281,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -290,7 +290,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -300,7 +300,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -647,7 +647,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 68d5c41..3ac19d4 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -130,7 +130,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "0", "692", @@ -144,7 +144,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -153,7 +153,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -198,7 +198,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -207,7 +207,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -216,7 +216,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "0", "1" @@ -225,7 +225,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 478619f..d965a04 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -148,7 +148,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -157,7 +157,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1", @@ -167,7 +167,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -176,7 +176,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -195,7 +195,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -244,7 +244,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -253,7 +253,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -262,7 +262,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -272,7 +272,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" diff --git a/powerhint-panther.json b/powerhint-panther.json index 65b5352..46b5ff9 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -157,7 +157,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -166,7 +166,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1" @@ -175,7 +175,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -184,7 +184,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "813" @@ -203,7 +203,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -252,7 +252,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -261,7 +261,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -270,7 +270,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -280,7 +280,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -627,7 +627,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index d1148b1..0eefcf6 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -130,7 +130,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "0", "692", @@ -144,7 +144,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -153,7 +153,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -198,7 +198,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -207,7 +207,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -216,7 +216,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "0", "1" @@ -225,7 +225,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" From b066b134ca51028d677a788d6ea42f6ab3cbc4a2 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Wed, 11 Oct 2023 15:18:34 +0800 Subject: [PATCH 15/58] Add LE Audio allow list candidate device for P22 Bug: 300012501 Test: manual test Change-Id: Ie109df4c6ca83e42fc47a07ebd7f41a7255651ec --- device-cheetah.mk | 4 ++++ device-panther.mk | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index fe8e1b1..d025b17 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -213,6 +213,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio Unicast Allowlist +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.allow_list=SM-R510 + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool diff --git a/device-panther.mk b/device-panther.mk index 478ea7c..dcd92ca 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -183,6 +183,11 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio Unicast Allowlist +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.allow_list=SM-R510 + + # Bluetooth EWP test tool PRODUCT_PACKAGES_DEBUG += \ ewp_tool From a6e9460ef2d4bce86efbc3498b665fba469f232b Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:12 +0000 Subject: [PATCH 16/58] Update cheetah SVN to 35 Bug: 302612466 Change-Id: Ib512f6ca86a5b87b2bc521f85e271d84603eb0c9 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 62556a9..26dbef7 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ec9b31a675ff49fc12e9a81b5a961c3c334f91e3 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:37 +0000 Subject: [PATCH 17/58] Update panther SVN to 35 Bug: 302612466 Change-Id: I8d176a2ba9ddef34449edae5df6fdfd55d346c51 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 1416685..f2dd9f8 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 2c03c3ec005aa47aea6c832ff1be3cf33427ccb1 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 17 Oct 2023 07:53:34 +0000 Subject: [PATCH 18/58] gps: Enable Vzw SUPL OTDOA Bug: 303401506 Test: OTDOA test in b/303401506 Change-Id: Ibab24361b5eaf829f355d715d8294f4f1e121cc2 --- location/gps.xml | 2 +- location/gps.xml.c10 | 2 +- location/gps.xml.p10 | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.c10 | 2 +- location/gps_user.xml.p10 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 3e9b0df..4dd4ceb 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index 26a55f7..f603aa9 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 0215c9e..92376f0 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index d85da72..d64ba54 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index 1a369a6..6a15fe9 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index c1e5d59..839aed3 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From a039a3d3ec1cdbfd44486b02d4b6e4443bfa2c09 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 20 Oct 2023 11:29:25 -0700 Subject: [PATCH 19/58] thermal: align the setting VSKIN related sensors Bug: 302435949 Test: emul_temp Change-Id: Ib2436ef6c715d0ddbe7f46afa1514a5a7f138477 --- thermal_info_config_cheetah.json | 12 ++++++------ thermal_info_config_panther.json | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 6ef7ea7..a492fd2 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -143,8 +143,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -159,8 +159,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -214,8 +214,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index f0abf68..b786da2 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -143,8 +143,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -159,8 +159,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -214,8 +214,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -319,8 +319,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, From 2ff44800eb64032847495ac97f5c7de03705c604 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:43 +0000 Subject: [PATCH 20/58] Update cheetah SVN to 36 Bug: 302612466 Change-Id: I639d80c0b9f299cffef48fb7719cfbacc776ba45 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 26dbef7..736f80f 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 94bff2832a3ec4c2f382643a707a43172150df4c Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:04 +0000 Subject: [PATCH 21/58] Update panther SVN to 36 Bug: 302612466 Change-Id: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index f2dd9f8..a6135f0 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 2a2884b47cb5d795c6e72d2f1fd5d560c9c647ec Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:37 +0000 Subject: [PATCH 22/58] Update panther SVN to 35 Bug: 302612466 Change-Id: I8d176a2ba9ddef34449edae5df6fdfd55d346c51 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 2b45a4a..4827a03 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 7e02c7f28a6cfa6939ee7a8c798559d2b299e26d Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:12 +0000 Subject: [PATCH 23/58] Update cheetah SVN to 35 Bug: 302612466 Change-Id: Ib512f6ca86a5b87b2bc521f85e271d84603eb0c9 (cherry picked from commit a6e9460ef2d4bce86efbc3498b665fba469f232b) --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index b4beb8a..ea945a9 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 92a618d04ff92d8410f7d035236bac7fe5c3d537 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:43 +0000 Subject: [PATCH 24/58] Update cheetah SVN to 36 Bug: 302612466 Change-Id: I639d80c0b9f299cffef48fb7719cfbacc776ba45 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ea945a9..4be40c9 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 59025a6c836b8eae7ec6e2f59da3f920c4e13033 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:14:04 +0000 Subject: [PATCH 25/58] Update panther SVN to 36 Bug: 302612466 Change-Id: I29083bb2d81f0cf11940d7f1ea2ce28922ea830e --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 4827a03..f4ed67e 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ec518897c23085d558af3971154bdf09ab8256c5 Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 19:07:14 +0000 Subject: [PATCH 26/58] Adding Fast Pair extended IDs for Pixel 7 Adding the Fast Pair extended IDs for Pixel 7 so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: Manually flashed a cheetha and panther device and validated the FP bottom sheet is displayed on a nearby other device Change-Id: I29599f388b0689db5e105d00ccf9f4bbfde9d84a --- device-cheetah.mk | 5 +++++ device-panther.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 736f80f..f3e6c11 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -385,3 +385,8 @@ PRODUCT_SYSTEM_PROPERTIES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=cheetah diff --git a/device-panther.mk b/device-panther.mk index a6135f0..d70907c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -370,3 +370,8 @@ PRODUCT_SYSTEM_PROPERTIES += \ # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=panther From 9205873929d4f1afe7a09c4f322fa7bbeb18fd98 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:17:11 +0000 Subject: [PATCH 27/58] Update cheetah SVN to 37 Bug: 302612466 Change-Id: I19ff3f5174554e51af5201ec3b5928cfaddf26f6 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index f3e6c11..742544c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=36 + ro.vendor.build.svn=37 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a1eee239bb39277c5afb0074a30c20244bf68692 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:13:58 +0000 Subject: [PATCH 28/58] Update panther SVN to 37 Bug: 302612466 Change-Id: I075a42359d9cdc1984dfb2057808fb1a9bd8e909 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index d70907c..aff4d8c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=36 + ro.vendor.build.svn=37 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 3cc2927e27b1adb26434616c2cb366804c79055d Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Tue, 24 Oct 2023 17:51:58 +0800 Subject: [PATCH 29/58] Split bootloader prebuilt to 24Q1 and trunk version Bug: 299879102 Change-Id: I6ba0748b82770025f585d79b8d7aba281391e38d --- cheetah/BoardConfig.mk | 6 +++++- cloudripper/BoardConfig.mk | 5 +++++ device-cheetah.mk | 5 +++++ device-cloudripper.mk | 5 +++++ device-panther.mk | 5 +++++ device-ravenclaw.mk | 10 ++++++++++ panther/BoardConfig.mk | 6 +++++- ravenclaw/BoardConfig.mk | 5 +++++ 8 files changed, 45 insertions(+), 2 deletions(-) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index 66bf1a4..c5976fc 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -18,7 +18,11 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_CHEETAH_BOOTLOADER_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif # 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 e69540e..0c97cee 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -15,6 +15,11 @@ # 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 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true diff --git a/device-cheetah.mk b/device-cheetah.mk index 51057e6..6296386 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -289,6 +289,11 @@ 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 +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 b3ef294..aa386b3 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -155,6 +155,11 @@ 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 +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 0d1d53c..bfdd620 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -273,6 +273,11 @@ 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 +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 7b56e1a..b05f844 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -145,6 +145,11 @@ 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 +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) @@ -161,6 +166,11 @@ 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 +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 c11cb43..d985330 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -21,7 +21,11 @@ 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) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_PANTHER_BOOTLOADER_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +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 caa2afc..a724a26 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -15,6 +15,11 @@ # 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 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif TARGET_SCREEN_DENSITY := 560 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_CLOUDRIPPER := true From b0fb9be930027aa1664c9410697af4a4ec8ab5c3 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 25 Oct 2023 16:43:13 -0600 Subject: [PATCH 30/58] Fix lunch choices for git_main We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: I1390f8707ed0eca0bf51112eef4b2cc4328e52a8 --- AndroidProducts.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 9d64a36..4467779 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -27,9 +27,9 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/factory_panther.mk COMMON_LUNCH_CHOICES := \ - aosp_cloudripper-userdebug \ - aosp_ravenclaw-userdebug \ - aosp_cheetah-userdebug \ - aosp_cheetah_hwasan-userdebug \ - aosp_panther-userdebug \ - aosp_panther_hwasan-userdebug + aosp_cloudripper-trunk_staging-userdebug \ + aosp_ravenclaw-trunk_staging-userdebug \ + aosp_cheetah-trunk_staging-userdebug \ + aosp_cheetah_hwasan-trunk_staging-userdebug \ + aosp_panther-trunk_staging-userdebug \ + aosp_panther_hwasan-trunk_staging-userdebug From 040b76b2e95433879a7e0fadcd7c75a891adf600 Mon Sep 17 00:00:00 2001 From: Will Song Date: Fri, 27 Oct 2023 22:03:33 +0000 Subject: [PATCH 31/58] PREUPLOAD: Enforce jsonlint in preupload Checks syntax and simple brace balances for all JSON files. Test: Edit any json file and try upload Bug: 127794899 Change-Id: I8f206409fbee40b6d0a197bb115e5a56653ebf81 --- PREUPLOAD.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 PREUPLOAD.cfg diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..37ebb5e --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Builtin Hooks] +jsonlint = true From 3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 14:58:26 +0000 Subject: [PATCH 32/58] Revert "pantah: Replace NFC app with NFC apex" Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056 Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056 Bug: 309117462 Change-Id: I9adf4d5adf38a986fb95ca43e307914ae7439394 Test: Compiles, device boots up --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- device-ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 6296386..17d8400 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -111,7 +111,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayCheetah diff --git a/device-cloudripper.mk b/device-cloudripper.mk index aa386b3..8b2b419 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index bfdd620..4c2ed9d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -90,7 +90,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayPanther diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index b05f844..d6da01d 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st From 08fbfb05f16c273d2940d2b687a5113990f4a3ea Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 19:04:54 +0000 Subject: [PATCH 33/58] Revert "pantah(nfc): Modify NFC overlays for NFC apex" Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://android-review.googlesource.com/q/commit:883343a5e59ad915cef349ac21c18b1470dbb777) Merged-In: Idced173f9063bed7899354d20553b3694579329a Change-Id: Idced173f9063bed7899354d20553b3694579329a --- .../packages/apps/Nfc}/res/values/config.xml | 0 cheetah/rro_overlays/NfcOverlay/Android.bp | 9 ------- .../NfcOverlay/AndroidManifest.xml | 27 ------------------- cheetah/rro_overlays/NfcOverlay/OWNERS | 2 -- device-cheetah.mk | 3 +-- device-panther.mk | 3 +-- .../packages/apps/Nfc}/res/values/config.xml | 0 panther/rro_overlays/NfcOverlay/Android.bp | 9 ------- .../NfcOverlay/AndroidManifest.xml | 27 ------------------- panther/rro_overlays/NfcOverlay/OWNERS | 2 -- 10 files changed, 2 insertions(+), 80 deletions(-) rename cheetah/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%) delete mode 100644 cheetah/rro_overlays/NfcOverlay/Android.bp delete mode 100644 cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 cheetah/rro_overlays/NfcOverlay/OWNERS rename panther/{rro_overlays/NfcOverlay => overlay/packages/apps/Nfc}/res/values/config.xml (100%) delete mode 100644 panther/rro_overlays/NfcOverlay/Android.bp delete mode 100644 panther/rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 panther/rro_overlays/NfcOverlay/OWNERS diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/overlay/packages/apps/Nfc/res/values/config.xml similarity index 100% rename from cheetah/rro_overlays/NfcOverlay/res/values/config.xml rename to cheetah/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/cheetah/rro_overlays/NfcOverlay/Android.bp b/cheetah/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index 83a878d..0000000 --- a/cheetah/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_pantah_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayCheetah", - sdk_version: "current", - product_specific: true -} diff --git a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/cheetah/rro_overlays/NfcOverlay/OWNERS b/cheetah/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/cheetah/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS diff --git a/device-cheetah.mk b/device-cheetah.mk index 17d8400..f12c803 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -113,8 +113,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayCheetah + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index 4c2ed9d..8d8099c 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -92,8 +92,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayPanther + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/overlay/packages/apps/Nfc/res/values/config.xml similarity index 100% rename from panther/rro_overlays/NfcOverlay/res/values/config.xml rename to panther/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/panther/rro_overlays/NfcOverlay/Android.bp b/panther/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index a1d3b96..0000000 --- a/panther/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_pantah_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayPanther", - sdk_version: "current", - product_specific: true -} diff --git a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/panther/rro_overlays/NfcOverlay/OWNERS b/panther/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/panther/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS From 66ee8378171aa006723f9ec256b5432e90e0c1aa Mon Sep 17 00:00:00 2001 From: Poomarin Phloyphisut Date: Tue, 24 Oct 2023 03:24:39 +0000 Subject: [PATCH 34/58] [USB AIDL] Remove USB configuration from audio_platform_configuration.xml These configs are hardcoded into audio HAL instead because it's very rarely changed. Bug: 307439907 Test: Local Test. Change-Id: I678d989ed60b632a7de41b0b61d6fcbfd0e6ca38 --- .../aidl_config/audio_platform_configuration.xml | 10 +--------- .../aidl_config/audio_platform_configuration.xml | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/audio/cheetah/aidl_config/audio_platform_configuration.xml b/audio/cheetah/aidl_config/audio_platform_configuration.xml index a3144da..66fbad8 100644 --- a/audio/cheetah/aidl_config/audio_platform_configuration.xml +++ b/audio/cheetah/aidl_config/audio_platform_configuration.xml @@ -46,15 +46,7 @@ - - - - - - - - - + diff --git a/audio/panther/aidl_config/audio_platform_configuration.xml b/audio/panther/aidl_config/audio_platform_configuration.xml index a3144da..66fbad8 100644 --- a/audio/panther/aidl_config/audio_platform_configuration.xml +++ b/audio/panther/aidl_config/audio_platform_configuration.xml @@ -46,15 +46,7 @@ - - - - - - - - - + From deb295c2de0beeda2780ba2e6f564068573210bb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:18:27 +0000 Subject: [PATCH 35/58] Update cheetah SVN to 38 Bug: 302612466 Change-Id: I7a139e86b6773d68e483dc5cb8182355d691fb61 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 742544c..9255c59 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=38 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 2b4350d830ebd253cb4dbea54b9458f0819efbdb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:17:36 +0000 Subject: [PATCH 36/58] Update panther SVN to 38 Bug: 302612466 Change-Id: I34ce3669c65639ee5059b181a098ef951b51ca74 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index aff4d8c..c7fbd0f 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=38 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ea419cb1aed64a52aa9e15c259a60e43db2e90a8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:24:52 +0000 Subject: [PATCH 37/58] Update cheetah SVN to 39 Bug: 309529736 Change-Id: I6aa90a8ebddb1eab4c26a361569643ce5ed665fe --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 9255c59..99cdc41 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=38 + ro.vendor.build.svn=39 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 0fd147e544162c44c67ec81c0dd0a6ad5a025c08 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Sat, 11 Nov 2023 02:16:30 +0000 Subject: [PATCH 38/58] Update panther SVN to 39 Bug: 309529736 Change-Id: Ifb27544932f89b0e2fd3acfb63316af9a7dd2109 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index c7fbd0f..1342945 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=38 + ro.vendor.build.svn=39 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 6c10cd72b8aa5939a53b60de81f5810c4283acdc Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 14 Nov 2023 03:50:24 +0000 Subject: [PATCH 39/58] Update cheetah SVN to 40 Bug: 309529736 Change-Id: Ic369fc71b2993b51fe7ab017d7527f835ce55ea9 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 99cdc41..e6c0d7f 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=39 + ro.vendor.build.svn=40 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e05ba05b57e186538304ef3c65bd4f546b5716c1 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 14 Nov 2023 03:35:18 +0000 Subject: [PATCH 40/58] Update panther SVN to 40 Bug: 309529736 Change-Id: I250bc0d8ce0e3df1347015466a671d2ef20becd3 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 1342945..4cfa0a0 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=39 + ro.vendor.build.svn=40 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a008293ba5b7f5b57bab0f1b25aa9c205204dadb Mon Sep 17 00:00:00 2001 From: Shin-Yu Wang Date: Sat, 18 Nov 2023 03:22:38 +0000 Subject: [PATCH 41/58] Update idle timer setting Bug: 307593860 Test: check result of `adb shell getprop ro.surface_flinger.set_idle_timer_ms` Change-Id: I3cc93c3c5aa52d62672636393e4bc3e43cc4c7e4 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 39cde7b..a2583cf 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -261,7 +261,7 @@ $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factor endif # Display -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true # WiFi Overlay From 2e4890b8ead182de69a7033f21c6997277bb3596 Mon Sep 17 00:00:00 2001 From: Shin-Yu Wang Date: Fri, 24 Nov 2023 09:36:37 +0000 Subject: [PATCH 42/58] Revert "Update idle timer setting" This reverts commit a008293ba5b7f5b57bab0f1b25aa9c205204dadb. Reason for revert: broken test b/312417871 Bug: 307593860 Change-Id: Ia6db7b3fd4e22dce5443877756f9881d48214019 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index a2583cf..39cde7b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -261,7 +261,7 @@ $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factor endif # Display -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true # WiFi Overlay From 119db5acb6d133d9191d87ca99849617a8ca78fa Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:26:57 +0000 Subject: [PATCH 43/58] Update cheetah SVN to 41 Bug: 313696499 Change-Id: If57b5ff9871f4daecae1b2219e7d3fcb456dde5e --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index e6c0d7f..0b00963 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 75a9c0a8ef8c59b940a4a59788402cc4b71c075f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:28:20 +0000 Subject: [PATCH 44/58] Update cheetah SVN to 42 Bug: 313696499 Change-Id: I7658cd580290f964bc5391e0874cf3e8bece6a8c --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 0b00963..b9e7c88 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 1695374b6413a84d3de25ec559ccb28b33638847 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:21:15 +0000 Subject: [PATCH 45/58] Update panther SVN to 41 Bug: 313696499 Change-Id: Ic6534eee5f78ca57f7f9529b1c35ccfb3cafae74 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 4cfa0a0..9900755 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=40 + ro.vendor.build.svn=41 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e66288cae4630fa076be4a950117f8d8e11931b7 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:23:19 +0000 Subject: [PATCH 46/58] Update panther SVN to 42 Bug: 313696499 Change-Id: I9eec5502196e2b1b681152a604ba0e0d64a37ea8 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 9900755..e09cf45 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=41 + ro.vendor.build.svn=42 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From aa3c94e272d388cc559f58faabb85caa2eeef48e Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 47/58] Revert^2 "pantah: Replace NFC app with NFC apex" 3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 Bug: 303286040 Test: Compiles Change-Id: I4da74311505445715132b84afb557ec7e126abac --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- device-ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index e9ba6e4..be0451e 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -111,7 +111,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 8b2b419..0347420 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index 9501bb4..b90108a 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -90,7 +90,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index d6da01d..9906272 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From 2280e6ea3db5e414f1ace9734d3066d9b3eb4654 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 48/58] Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex" 08fbfb05f16c273d2940d2b687a5113990f4a3ea Bug: 303286040 Test: Compiles Change-Id: I4ea4668bd7de33fa5a6c80b742dab0a6b27b4936 --- cheetah/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ cheetah/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ device-cheetah.mk | 3 +- device-panther.mk | 3 +- panther/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ panther/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ 10 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 cheetah/rro_overlays/NfcOverlay/Android.bp create mode 100644 cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 cheetah/rro_overlays/NfcOverlay/OWNERS create mode 100644 cheetah/rro_overlays/NfcOverlay/res/values/config.xml create mode 100644 panther/rro_overlays/NfcOverlay/Android.bp create mode 100644 panther/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 panther/rro_overlays/NfcOverlay/OWNERS create mode 100644 panther/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/cheetah/rro_overlays/NfcOverlay/Android.bp b/cheetah/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..83a878d --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayCheetah", + sdk_version: "current", + product_specific: true +} diff --git a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/cheetah/rro_overlays/NfcOverlay/OWNERS b/cheetah/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..0055264 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + true + true + + GP4BC + GE2AE + GFE4J + + true + + 75 + 160 + false + + 38 + + + 100 + + diff --git a/device-cheetah.mk b/device-cheetah.mk index be0451e..15381b8 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -113,7 +113,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayCheetah # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-panther.mk b/device-panther.mk index b90108a..969a6c6 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -92,7 +92,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayPanther # SecureElement PRODUCT_PACKAGES += \ diff --git a/panther/rro_overlays/NfcOverlay/Android.bp b/panther/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..a1d3b96 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayPanther", + sdk_version: "current", + product_specific: true +} diff --git a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/panther/rro_overlays/NfcOverlay/OWNERS b/panther/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..d5bfd3d --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + true + + GQML3 + GVU6C + G03Z5 + + true + + 70 + 150 + false + + 38 + + + 97 + + From cb784ede3161338c943785621f07ab37b118b606 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Thu, 17 Aug 2023 12:05:43 -0700 Subject: [PATCH 49/58] powerhint: add game mode tuning nodes Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes. Test: build Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed55bd67b0a7cdb1521f4df70b7c854246aa4492) Merged-In: I826da5058916abb1e676774ef19fe05710588392 Change-Id: I826da5058916abb1e676774ef19fe05710588392 --- powerhint-cheetah-a0.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-cheetah.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-cloudripper.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-panther-a0.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-panther.json | 40 ++++++++++++++++++++++++++++++++++++++ powerhint-ravenclaw.json | 40 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 240 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index 411c7fb..c73d20a 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -48,6 +48,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -80,6 +90,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -114,6 +134,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", @@ -147,6 +177,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 4d6c413..45b0b7d 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -61,6 +61,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -93,6 +103,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -127,6 +147,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUDvfsPeriod", "Path": "/sys/devices/platform/28000000.mali/dvfs_period", @@ -165,6 +195,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index 3ac19d4..c985b53 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -41,6 +41,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -64,6 +74,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -86,6 +106,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", @@ -119,6 +149,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index d965a04..2848382 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -47,6 +47,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -75,6 +85,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -103,6 +123,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", @@ -136,6 +166,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-panther.json b/powerhint-panther.json index 46b5ff9..0a4bce9 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -60,6 +60,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -88,6 +98,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -116,6 +136,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "ReducePreferIdle", "Path": "/proc/vendor_sched/reduce_prefer_idle", @@ -145,6 +175,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 0eefcf6..06f5377 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -41,6 +41,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -64,6 +74,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -86,6 +106,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/28000000.mali/hint_min_freq", @@ -119,6 +149,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", From 4414d256ef6ed22656c72233eef18c91adcfbb3f Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Thu, 17 Aug 2023 12:18:34 -0700 Subject: [PATCH 50/58] powerhint: game mode tuning Test: Load powerhint file on device and verify tuned parameters are default. Start Subway Surfers game and verify tuned parameters are expected tuned values. Switch away from game, and quit the game, and verify tuned parameters return to default. Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c1688eb48e4de7f6de344f406e3880e0a46ebcaa) Merged-In: I7b5346f05dc06c18f986c52805bfbb979ae173f5 Change-Id: I7b5346f05dc06c18f986c52805bfbb979ae173f5 --- powerhint-cheetah-a0.json | 78 +++++++++++++++++++++++++++++++++++--- powerhint-cheetah.json | 78 +++++++++++++++++++++++++++++++++++--- powerhint-cloudripper.json | 72 +++++++++++++++++++++++++++++++++++ powerhint-panther-a0.json | 78 +++++++++++++++++++++++++++++++++++--- powerhint-panther.json | 78 +++++++++++++++++++++++++++++++++++--- powerhint-ravenclaw.json | 72 +++++++++++++++++++++++++++++++++++ 6 files changed, 432 insertions(+), 24 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index c73d20a..c98446c 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -684,12 +684,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -708,6 +702,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1788,6 +1824,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 45b0b7d..6a209c1 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -733,12 +733,6 @@ "Duration": 1000, "Value": "10" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Type": "DoHint", @@ -762,6 +756,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -2008,6 +2044,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index c985b53..6d10711 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -452,6 +452,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1132,6 +1174,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 2848382..5737a14 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -673,12 +673,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -697,6 +691,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1675,6 +1711,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-panther.json b/powerhint-panther.json index 0a4bce9..2141e41 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -707,12 +707,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "LAUNCH", - "Node": "FGPreferIdle", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -731,6 +725,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1864,6 +1900,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 06f5377..d01f39c 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -452,6 +452,48 @@ "Duration": 5000, "Value": "9999999" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAUClampBoost", @@ -1132,6 +1174,36 @@ "Duration": 0, "Value": "572000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", From 77141f29c55bb75123b60e9ab1f390c5ebf15d7c Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:40:51 +0000 Subject: [PATCH 51/58] Update panther SVN to 43 Bug: 313797924 Change-Id: Id3546da8690b20b484cec286dfa336a354d9f575 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index e09cf45..43f0c2b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=42 + ro.vendor.build.svn=43 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From b43929798cc6fef9c765e0308597d36149102167 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:44:13 +0000 Subject: [PATCH 52/58] Update cheetah SVN to 43 Bug: 313797924 Change-Id: Iee6887b786bfdb7738d6df22e8fd48d68cfe983e --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index b9e7c88..ebf3d16 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=42 + ro.vendor.build.svn=43 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From dea855285868b2895df4efe8d7811c78019015fb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:41:50 +0000 Subject: [PATCH 53/58] Update panther SVN to 44 Bug: 313797924 Change-Id: I44a8706e5bd151c6a1df87d35933334140fbd777 --- device-panther.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-panther.mk b/device-panther.mk index 43f0c2b..0287f29 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -288,7 +288,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=43 + ro.vendor.build.svn=44 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 14a391f57f931590de11a6e223d6ca73a830c628 Mon Sep 17 00:00:00 2001 From: David Chen Date: Tue, 5 Dec 2023 06:58:02 +0000 Subject: [PATCH 54/58] Add zoom boost in powerhint for C10 and P10 This patch is meant to reduce frame drop rate in 60FPS video recording with zoom in/out. The boost will be triggered at 60FPS video recording while zoom ratio change (for each request that contain zoom ratio control in metadata), and will last for 15 frames. Test: gca_smoke_test Bug: 315102326 Change-Id: Iaa3e468b4732bea50f97b0e9678305a6a6f41263 --- powerhint-cheetah-a0.json | 12 ++++++++++++ powerhint-cheetah.json | 14 +++++++++++++- powerhint-panther-a0.json | 12 ++++++++++++ powerhint-panther.json | 14 +++++++++++++- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index c98446c..0f8c182 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -1007,6 +1007,18 @@ "Duration": 1000, "Value": "664000" }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 6a209c1..101b43e 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -362,7 +362,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", @@ -1131,6 +1131,18 @@ "Duration": 1000, "Value": "664000" }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 5737a14..5a89a89 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -996,6 +996,18 @@ "Duration": 1000, "Value": "664000" }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", diff --git a/powerhint-panther.json b/powerhint-panther.json index 2141e41..a067b1a 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -342,7 +342,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "DisplayWakeup", @@ -1089,6 +1089,18 @@ "Duration": 1000, "Value": "664000" }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_ZOOMING_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", From a950f0aa8ac3cbe1f371c386ca45704f8dbf03a8 Mon Sep 17 00:00:00 2001 From: leohsieh Date: Mon, 11 Dec 2023 20:45:53 +0800 Subject: [PATCH 55/58] udfps: split trusty app to 24Q1 and trunk version fingerprint app -> firmware/fingerprint/[24Q1|trunk] Bug: 310904673 Change-Id: Idc63e53958a687cca3003deadcf4ae1e818fbff7 --- device-cheetah.mk | 5 +++++ device-panther.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index c14d596..bfcec46 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -274,6 +274,11 @@ 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 +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) diff --git a/device-panther.mk b/device-panther.mk index 03e1bfe..f8a2487 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -254,6 +254,11 @@ 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 +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) From 5c5be2e60a8f71be416c991fb5d55effb2171fc9 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 23:44:55 +0000 Subject: [PATCH 56/58] Update cheetah SVN to 44 Bug: 313797924 Change-Id: I24beb8eadae4c9df3b633b6fbf1e0c243f1e9dd6 --- device-cheetah.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index ebf3d16..d90574c 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -303,7 +303,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=43 + ro.vendor.build.svn=44 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From dcd3d4207e4fc2675c846d229da9da6f2c2738f9 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 29 Sep 2023 15:37:49 -0700 Subject: [PATCH 57/58] thermal: PID tuning for 26 levels of chg_mdis Bug: 266625520 Test: verified by emul_temp Change-Id: I6e44ea99e6b350ede3763969b6c6a1769e06e86f --- thermal_info_config_charge_cheetah.json | 27 ++++++++++----------- thermal_info_config_charge_panther.json | 31 +++++++++++++------------ thermal_info_config_cheetah.json | 27 ++++++++++----------- thermal_info_config_panther.json | 31 +++++++++++++------------ 4 files changed, 60 insertions(+), 56 deletions(-) diff --git a/thermal_info_config_charge_cheetah.json b/thermal_info_config_charge_cheetah.json index 95724da..ca7e17a 100644 --- a/thermal_info_config_charge_cheetah.json +++ b/thermal_info_config_charge_cheetah.json @@ -46,26 +46,27 @@ "Combination":["qi_therm","quiet_therm"], "Coefficient":[0.35, 0.65], "Offset":-650, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1383 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.21, 0.21, 0.21, 0.43, 0.43, 0.43, 0.43] } ], "BindedCdevInfo": [ @@ -74,8 +75,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, diff --git a/thermal_info_config_charge_panther.json b/thermal_info_config_charge_panther.json index b4be800..7ab7626 100644 --- a/thermal_info_config_charge_panther.json +++ b/thermal_info_config_charge_panther.json @@ -46,26 +46,27 @@ "Combination":["qi_therm", "quiet_therm"], "Coefficient":[0.282, 0.718], "Offset":-448, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1300, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2300, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 7600, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1300 }, "ExcludedPowerInfo": [ { - "PowerRail": "POWER_FOR_CHARGING_THROTTLING", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4] } ], "BindedCdevInfo": [ @@ -74,8 +75,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, @@ -182,7 +183,7 @@ "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index a492fd2..aeba547 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -280,26 +280,27 @@ "Combination":["qi_therm","quiet_therm"], "Coefficient":[0.35, 0.65], "Offset":-650, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1383 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerWeight": [0.21, 0.21, 0.21, 0.43, 0.43, 0.43, 0.43] } ], "BindedCdevInfo": [ @@ -308,8 +309,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index b786da2..553b33e 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -280,26 +280,27 @@ "Combination":["qi_therm", "quiet_therm"], "Coefficient":[0.282, 0.718], "Offset":-448, - "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], - "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 4.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, "NAN", "NAN", "NAN", "NAN"] + "I_Max":["NAN", "NAN", 1300, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2300, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 7600, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1300 }, "ExcludedPowerInfo": [ { - "PowerRail": "POWER_FOR_CHARGING_THROTTLING", - "PowerWeight": [0.5, 0.5, 0.8, 1.0, 1.0, 1.0, 1.0] + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.2, 0.2, 0.2, 0.4, 0.4, 0.4, 0.4] } ], "BindedCdevInfo": [ @@ -308,8 +309,8 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 1, - "CdevCeiling": [0, 4, 7, 8, 9, 9, 9], - "LimitInfo": [0, 0, 0, 0, 0, 9, 9] + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] } ] }, @@ -826,7 +827,7 @@ "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], From 6c10bd721dab49692aa369452093c44c2f5804ed Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 14:36:35 +0800 Subject: [PATCH 58/58] Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: Ia531c6512e8cef3c5d3081ee134b732232f1bc88 --- cheetah/BoardConfig.mk | 2 ++ cloudripper/BoardConfig.mk | 2 ++ device-cheetah.mk | 4 ++++ device-cloudripper.mk | 2 ++ device-panther.mk | 4 ++++ device-ravenclaw.mk | 4 ++++ panther/BoardConfig.mk | 2 ++ ravenclaw/BoardConfig.mk | 2 ++ 8 files changed, 22 insertions(+) diff --git a/cheetah/BoardConfig.mk b/cheetah/BoardConfig.mk index c5976fc..3cedf15 100644 --- a/cheetah/BoardConfig.mk +++ b/cheetah/BoardConfig.mk @@ -20,6 +20,8 @@ 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 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/cloudripper/BoardConfig.mk b/cloudripper/BoardConfig.mk index 0c97cee..c2dcfa0 100644 --- a/cloudripper/BoardConfig.mk +++ b/cloudripper/BoardConfig.mk @@ -17,6 +17,8 @@ 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 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/device-cheetah.mk b/device-cheetah.mk index 346df4e..f8e82fa 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -276,6 +276,8 @@ 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%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -296,6 +298,8 @@ 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%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 0347420..5d30dee 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -157,6 +157,8 @@ 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%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-panther.mk b/device-panther.mk index b793f1b..c6f0794 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -256,6 +256,8 @@ 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%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -280,6 +282,8 @@ 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%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 9906272..2dcc35c 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -147,6 +147,8 @@ 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%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk endif @@ -168,6 +170,8 @@ 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%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk endif diff --git a/panther/BoardConfig.mk b/panther/BoardConfig.mk index d985330..81f4438 100644 --- a/panther/BoardConfig.mk +++ b/panther/BoardConfig.mk @@ -23,6 +23,8 @@ 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 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/ravenclaw/BoardConfig.mk b/ravenclaw/BoardConfig.mk index a724a26..8fc4e6a 100644 --- a/ravenclaw/BoardConfig.mk +++ b/ravenclaw/BoardConfig.mk @@ -17,6 +17,8 @@ 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 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif