From eaaa3f25f393e7c18c03253e73937935cebb6e5e Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 17 Feb 2023 15:01:11 -0800 Subject: dck: add SE capability property Bug: 229777047 Test: boot cheetah; check logs to see that SE property is used Change-Id: I0e103c4bf621d662b6f0df78756cd78a442c19c4 Signed-off-by: Jeffrey Carlyle --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index eba2f403..7304865f 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -211,7 +211,8 @@ 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 # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts diff --git a/device-raven.mk b/device-raven.mk index 73d7b64d..dcd9c25e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -221,7 +221,8 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11 # 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 # SKU specific RROs PRODUCT_PACKAGES += \ -- cgit v1.2.3 From d88eab698ae9543cdf808471b5b7d2cc89e88a4a Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Fri, 30 Dec 2022 11:09:44 +0800 Subject: gps: Enable Vzw SUPL OTDOA Bug: 263852801 Test: OTDOA pass Change-Id: Ie11adb81cfe15959d0e964ea3e3d6661aa3f7907 --- location/gps.xml | 1 + location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + location/gps_user.xml | 1 + location/gps_user.xml.oriole | 1 + location/gps_user.xml.raven | 1 + 6 files changed, 6 insertions(+) diff --git a/location/gps.xml b/location/gps.xml index 8fb7c66e..7c534152 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index d85fd169..cd149a7b 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index a095dbd1..3c6dbc6d 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 5efd5421..baf0ee5f 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index 2d503725..558799d7 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index b2fb2bd2..08618579 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" -- cgit v1.2.3 From 28b6e560b5a820e11d6ca91041477bf35a1ded40 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 14 Apr 2023 10:58:58 -0700 Subject: Speed up oriole and raven 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: I0038c145ecd7061185e59aecceaa5b83ed32d846 --- device-oriole.mk | 3 +++ device-raven.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 298b1d9a..5866a6f9 100644 --- a/device-oriole.mk +++ b/device-oriole.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/raviole-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers diff --git a/device-raven.mk b/device-raven.mk index 4550a0bb..aa13350a 100644 --- a/device-raven.mk +++ b/device-raven.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/raviole-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers -- cgit v1.2.3 From 2640afcafea43c23b577e0fc9872f829ffe389f7 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Fri, 5 May 2023 04:02:11 +0000 Subject: Add Raven only sepolicy Bug: 274906319 Test: build pass and manual test Change-Id: Idc289ef7a1d635b26a94b265955d1a85795e64f4 --- device-raven.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-raven.mk b/device-raven.mk index 9eaea5f8..9872c73c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -84,6 +84,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ UwbOverlayR4 +# Bluetooth sepolicy +include device/google/gs101-sepolicy/raven-sepolicy.mk + # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ -- cgit v1.2.3 From 1a82245b5fcd96844ea5b525af7ab03fbbc0ce7a Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Sun, 7 May 2023 11:27:19 +0000 Subject: Add Oriole only sepolicy for bluetooth_ext Bug: 280970790 Test: make sepolicy and manual test Change-Id: I986f11c25b23c53321b47b9f142bd7bbf0f5000f --- device-oriole.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 5f78f6d3..686da707 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -73,6 +73,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/raviole/powerhint-oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json +# Bluetooth sepolicy +include device/google/gs101-sepolicy/oriole-sepolicy.mk + # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ -- cgit v1.2.3 From 686598b11680e91dd61e63e04413768e581662c4 Mon Sep 17 00:00:00 2001 From: chenkris Date: Thu, 8 Jun 2023 09:59:13 +0000 Subject: Move goodix mk files from device/google/gs101 to vendor/goodix/udfps Bug: 270657514 Test: build Change-Id: Ibeec835b439f0756a18295308ab70a4d4f29ecb6 --- device-oriole.mk | 11 ++++++----- device-raven.mk | 12 ++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 5e830359..22e1801d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -28,21 +28,22 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/orio $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/oriole/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersOriole.mk) -GOODIX_CONFIG_BUILD_VERSION := g6_trusty DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay include device/google/raviole/audio/oriole/audio-tables.mk include device/google/gs101/device-shipping-common.mk -include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +# Fingerprint HAL +GOODIX_CONFIG_BUILD_VERSION := g6_trusty +include vendor/goodix/udfps/configuration/udfps_common.mk +ifeq ($(filter factory%, $(TARGET_PRODUCT)),) +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 # go/lyric-soong-variables diff --git a/device-raven.mk b/device-raven.mk index 1942212e..649ed19c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -28,21 +28,21 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/rave $(call inherit-product-if-exists, vendor/google/camera/devices/raviole/raven/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/WallpapersRaven.mk) -GOODIX_CONFIG_BUILD_VERSION := g6_trusty DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay include device/google/raviole/audio/raven/audio-tables.mk include device/google/gs101/device-shipping-common.mk -include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk - -ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +# Fingerprint HAL +GOODIX_CONFIG_BUILD_VERSION := g6_trusty +include vendor/goodix/udfps/configuration/udfps_common.mk +ifeq ($(filter factory%, $(TARGET_PRODUCT)),) +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 ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) -- cgit v1.2.3 From 79df8438dc86b104ff6c9c944ba436dfb7009eb7 Mon Sep 17 00:00:00 2001 From: chenkris Date: Tue, 13 Jun 2023 03:06:29 +0000 Subject: udfps: fix BB on git_master-without-vendor Bug: 286774587 Test: Build Change-Id: I0d62afec52c3e1df7dd3bf4c827e681e4bba529f --- device-oriole.mk | 6 +++--- device-raven.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 22e1801d..eccd700c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -39,11 +39,11 @@ include device/google/gs-common/touch/stm/stm11.mk # 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 # go/lyric-soong-variables diff --git a/device-raven.mk b/device-raven.mk index 649ed19c..2f4a15a6 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -38,11 +38,11 @@ include device/google/gs-common/touch/lsi/lsi.mk # 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 ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) -- cgit v1.2.3 From 63ab9286a422be9152f15d4c42b834f6bbeecc23 Mon Sep 17 00:00:00 2001 From: Max Bires Date: Wed, 21 Jun 2023 16:27:46 -0700 Subject: Remove deprecated enable_rkpd property The enable_rkpd property is no longer needed. This change removes the vestigial property. Test: Successful build Change-Id: I382d96253d7367272ca1f4ccf63bbb50949fbfa4 --- device-oriole.mk | 1 - device-raven.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4ad80edc..9000481a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -246,7 +246,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ # RKPD PRODUCT_PRODUCT_PROPERTIES += \ - remote_provisioning.enable_rkpd=true \ remote_provisioning.hostname=remoteprovisioning.googleapis.com \ # Set zram size diff --git a/device-raven.mk b/device-raven.mk index 6d5d58a0..c002bca4 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -261,7 +261,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ # RKPD PRODUCT_PRODUCT_PROPERTIES += \ - remote_provisioning.enable_rkpd=true \ remote_provisioning.hostname=remoteprovisioning.googleapis.com \ # Set zram size -- cgit v1.2.3 From 0b0f586c3b09f6db6d9456592ad2edae5adf46fb Mon Sep 17 00:00:00 2001 From: Nathan Kulczak Date: Tue, 15 Aug 2023 01:22:27 +0000 Subject: raviole/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: Ia26077bf854c51c40c707787d2476cf8620bb420 Signed-off-by: Nathan Kulczak --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index d9600aea..e397e770 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -162,7 +162,8 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_PRODUCT_PROPERTIES +=\ ro.vendor.vibrator.hal.long.frequency.shift=15 \ ro.vendor.vibrator.hal.device.mass=0.205 \ - ro.vendor.vibrator.hal.loc.coeff=2.25 + ro.vendor.vibrator.hal.loc.coeff=2.25 \ + persist.vendor.vibrator.hal.chirp.enabled=0 ACTUATOR_MODEL := luxshare_ict_081545 diff --git a/device-raven.mk b/device-raven.mk index a84f5e64..5f3b419c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -176,7 +176,8 @@ DEVICE_MANIFEST_FILE += \ PRODUCT_PRODUCT_PROPERTIES +=\ ro.vendor.vibrator.hal.long.frequency.shift=15 \ ro.vendor.vibrator.hal.device.mass=0.21 \ - ro.vendor.vibrator.hal.loc.coeff=2.5 + ro.vendor.vibrator.hal.loc.coeff=2.5 \ + persist.vendor.vibrator.hal.chirp.enabled=0 ACTUATOR_MODEL := luxshare_ict_081545 -- cgit v1.2.3 From 83eaed4b9e9c021850ddfd5429304cab253cb267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Thu, 7 Sep 2023 16:34:40 +0100 Subject: powerhint: fix json syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JSON syntax stipulates no final comma after the last element in an object. While Android's parser is not that strict, other tools like 'jq' are unhappy about incorrect syntax. Fix this up, so that we can use 'jq' to generate the android-mainline versions of these files in the next step. Bug: 265961701 Test: jq '."Nodes"[]' powerhint-oriole.json powerhint-raven.json Fixes: f56bbd1bfbba ("disable vendor idle balancer") Change-Id: If57e37d63d3a5bdd93552536691a192850198c0b Signed-off-by: André Draszik --- powerhint-oriole.json | 2 +- powerhint-raven.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index c1012306..16800dbf 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -284,7 +284,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "LimitFlashCurrent", diff --git a/powerhint-raven.json b/powerhint-raven.json index 81e01c0a..d925b511 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -283,7 +283,7 @@ "Values": [ "0", "1" - ], + ] }, { "Name": "LimitFlashCurrent", -- cgit v1.2.3 From e3f5d8ab1ce5514c94f8e59b4ab857d3090b11fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Mon, 19 Jun 2023 15:55:08 +0100 Subject: powerhint: provide android-mainline versions for Oriole & Raven MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The android-mainline kernel doesn't provide the scheduler vendor hooks, and therefore the pixel drivers don't expose anything below /proc/vendor_sched/. This causes powerpower-libperfmgr to emit *a lot* of warnings to logcat regarding failures to write to nodes below /proc/vendor_sched/. As a solution, provide a -mainline version of powerhint.json for the two platforms supported by android-mainline. The new files are based on revision f56bbd1bfbba ("disable vendor idle balancer") of powerhint.json and have all nodes and actions referring to /proc/vendor_sched/ removed using the following jq commands: for f in powerhint-oriole.json powerhint-raven.json ; do \ fdst="$(basename "${f}" .json)-mainline.json" names=$(jq '."Nodes"[] | select(."Path" | startswith("/proc/vendor_sched/")).Name' "${f}" \ | tr '\n' ' ' \ | sed -e 's|" "|", "|g') jq '. | del( ."Actions"[] | select(."Node"==('"${names}"')))' "${f}" > "${fdst}" jq '. | del( ."Nodes"[] | select(."Path" | startswith("/proc/vendor_sched/")) )' "${fdst}" > "${fdst}2" mv "${fdst}2" "${fdst}" done The -mainline version will be picked based on a boot property set by the mainline kernel. Bug: 265961701 Test: adb shell -nT getprop vendor.powerhal.config adb logcat -b all -D 'libperfmgr:V powerhal-libperfmgr:V *:S' m libperfmgr_test \ && adb push \ out/target/product/oriole/data/nativetest64/libperfmgr_test/libperfmgr_test \ /data/libperfmgr_test \ && adb shell /data/libperfmgr_test Change-Id: Ice07444e38194e5fcf2127e935afdd4d29ff8e87 Signed-off-by: André Draszik --- conf/init.oriole.rc | 3 + conf/init.raven.rc | 3 + device-oriole.mk | 3 +- device-raven.mk | 3 +- powerhint-oriole-mainline.json | 1365 ++++++++++++++++++++++++++++++++++++++++ powerhint-raven-mainline.json | 1346 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 2721 insertions(+), 2 deletions(-) create mode 100644 powerhint-oriole-mainline.json create mode 100644 powerhint-raven-mainline.json diff --git a/conf/init.oriole.rc b/conf/init.oriole.rc index 10206b35..23d1bff9 100644 --- a/conf/init.oriole.rc +++ b/conf/init.oriole.rc @@ -8,6 +8,9 @@ on init # nvmem dump chown system system /sys/bus/nvmem/devices/4-00500/nvmem +on init && property:ro.boot.vh_sched_available=0 + setprop vendor.powerhal.config powerhint-mainline.json + # Toggle glove_mode according to touch_sensitivity_mode on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1 write /sys/class/spi_master/spi11/spi11.0/glove_mode 00 diff --git a/conf/init.raven.rc b/conf/init.raven.rc index 5153c585..816e3689 100644 --- a/conf/init.raven.rc +++ b/conf/init.raven.rc @@ -11,6 +11,9 @@ on init # Power Stats HAL chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats +on init && property:ro.boot.vh_sched_available=0 + setprop vendor.powerhal.config powerhint-mainline.json + on fs # Face exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app diff --git a/device-oriole.mk b/device-oriole.mk index f1ea51eb..74d4f171 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -72,7 +72,8 @@ PRODUCT_COPY_FILES += \ # Power HAL config PRODUCT_COPY_FILES += \ - device/google/raviole/powerhint-oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + device/google/raviole/powerhint-oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json \ + device/google/raviole/powerhint-oriole-mainline.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-mainline.json \ # Bluetooth sepolicy include device/google/gs101-sepolicy/oriole-sepolicy.mk diff --git a/device-raven.mk b/device-raven.mk index 5839ec5b..b8fd1cae 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -79,7 +79,8 @@ PRODUCT_COPY_FILES += \ # Power HAL config PRODUCT_COPY_FILES += \ - device/google/raviole/powerhint-raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json + device/google/raviole/powerhint-raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json \ + device/google/raviole/powerhint-raven-mainline.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-mainline.json PRODUCT_PACKAGES += \ UwbOverlayR4 diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json new file mode 100644 index 00000000..55adc6b5 --- /dev/null +++ b/powerhint-oriole-mainline.json @@ -0,0 +1,1365 @@ +{ + "Nodes": [ + { + "Name": "MemFreq", + "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", + "Values": [ + "3172000", + "1352000", + "1014000", + "421000" + ], + "ResetOnInit": true + }, + { + "Name": "IntFreq", + "Path": "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/min_freq", + "Values": [ + "533000", + "100000" + ], + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1098000", + "1401000", + "930000", + "1197000", + "1328000", + "1598000", + "1803000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1024000", + "1197000", + "1491000", + "910000", + "1328000", + "1663000", + "1836000", + "1999000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "984000", + "1426000", + "1826000", + "1277000", + "1582000", + "1745000", + "2048000", + "2401000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1106000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", + "Values": [ + "762000", + "471000", + "400000", + "302000", + "151000" + ], + "ResetOnInit": true + }, + { + "Name": "DisplayWakeup", + "Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "PMQoSCpuDmaLatency", + "Path": "/dev/cpu_dma_latency", + "Values": [ + "44", + "1000" + ], + "HoldFd": true + }, + { + "Name": "CDCpuset", + "Path": "/dev/cpuset/camera-daemon/cpus", + "Values": [ + "0-3", + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-high-group/cpus", + "Values": [ + "0-3", + "6-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", + "Values": [ + "0-3", + "4-5" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", + "Values": [ + "0-3", + "4-7" + ], + "ResetOnInit": true + }, + { + "Name": "LimitFlashCurrent", + "Path": "vendor.camera.max_flash_current", + "Values": [ + "100", + "1500" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "PowerHALCameraRunning", + "Path": "vendor.powerhal.camerarunning", + "Values": [ + "1", + "0" + ], + "Type": "Property", + "ResetOnInit": true + }, + { + "Name": "INTCAMFreq", + "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + }, + { + "Name": "TNRFreq", + "Path": "/sys/devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUPowerPolicy", + "Path": "/sys/devices/platform/1c500000.mali/power_policy", + "Values": [ + "always_on", + "adaptive" + ], + "ResetOnInit": true + }, + { + "Name": "BigControlTempSet", + "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "MidControlTempSet", + "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "LittleControlTempSet", + "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Values": [ + "95000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "G3dControlTempSet", + "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "BigSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "MidSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "LittleSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "G3dSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "CPU_LITTLE_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_MID_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_BIG_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "TRUSTY_VIRTIO_HIGH", + "Path": "/sys/module/trusty_virtio/parameters/use_high_wq", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "TRUSTY_HIGH", + "Path": "/sys/module/trusty_core/parameters/use_high_wq", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "Dex2oatThreads", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads", + "Values": [ + "1", + "2", + "4", + "6", + "8" + ], + "Type": "Property" + }, + { + "Name": "Dex2oatCPUSet", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set", + "Values": [ + "0,1,2,3", + "0,1,2,3,4,5", + "0,1,2,3,4,5,6,7" + ], + "Type": "Property" + } + ], + "Actions": [ + { + "PowerHint": "CDCPUSET_RESTRICTED", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", + "Node": "CDMidCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDMidHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "LAUNCH", + "Node": "GPUPowerPolicy", + "Duration": 5000, + "Value": "always_on" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_EXTEND" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "984000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1024000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1098000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "1426000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1197000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "MemFreq", + "Duration": 300, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "IntFreq", + "Duration": 1000, + "Value": "533000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "INTCAMFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "TNRFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_FIXED_FPS", + "Node": "MemFreq", + "Duration": 4000, + "Value": "1352000" + }, + { + "PowerHint": "CAMERA_FIXED_FPS", + "Node": "CPUBigClusterMaxFreq", + "Duration": 4000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_FIXED_FPS", + "Node": "CPUBigClusterMinFreq", + "Duration": 4000, + "Value": "1106000" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "930000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1197000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_70", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1328000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_80", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1598000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_90", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1803000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_50", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "910000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_60", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1328000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_70", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1663000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_80", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1836000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_90", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1999000" + }, + { + "PowerHint": "LOW_POWER_CPU_50", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1277000" + }, + { + "PowerHint": "LOW_POWER_CPU_60", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1582000" + }, + { + "PowerHint": "LOW_POWER_CPU_70", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1745000" + }, + { + "PowerHint": "LOW_POWER_CPU_80", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "2048000" + }, + { + "PowerHint": "LOW_POWER_CPU_90", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "2401000" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Node": "DisplayWakeup", + "Duration": 50, + "Value": "1" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "100" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "1500" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "PowerHALRenderingState", + "Duration": 0, + "Value": "EXPENSIVE_RENDERING" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "400000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "TRUSTY_VIRTIO_HIGH", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "TRUSTY_HIGH", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "ML_ACC", + "Node": "PMQoSCpuDmaLatency", + "Duration": 2000, + "Value": "44" + } + ], + "AdpfConfig": [ + { + "Name": "REFRESH_120FPS", + "PID_On": true, + "PID_Po": 2, + "PID_Pu": 1, + "PID_I": 0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500, + "PID_Du": 0, + "UclampMin_On": true, + "UclampMin_Init": 232, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 83333330, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 15 + }, + { + "Name": "REFRESH_90FPS", + "PID_On": true, + "PID_Po": 2, + "PID_Pu": 1, + "PID_I": 0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500, + "PID_Du": 0, + "UclampMin_On": true, + "UclampMin_Init": 162, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 111111110, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 15 + }, + { + "Name": "REFRESH_60FPS", + "PID_On": true, + "PID_Po": 2, + "PID_Pu": 1, + "PID_I": 0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500, + "PID_Du": 0, + "UclampMin_On": true, + "UclampMin_Init": 162, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 166666660, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 15 + }, + { + "Name": "UiHighBoostWithoutPid", + "PID_On": false, + "PID_Po": 0, + "PID_Pu": 0, + "PID_I": 0, + "PID_I_Init": 0, + "PID_I_High": 0, + "PID_I_Low": 0, + "PID_Do": 0, + "PID_Du": 0, + "SamplingWindow_P": 1, + "SamplingWindow_I": 1, + "SamplingWindow_D": 1, + "UclampMin_On": true, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, + "ReportingRateLimitNs": 1, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 5 + }, + { + "Name": "UiLowBoostWithoutPid", + "PID_On": false, + "PID_Po": 0, + "PID_Pu": 0, + "PID_I": 0, + "PID_I_Init": 0, + "PID_I_High": 0, + "PID_I_Low": 0, + "PID_Do": 0, + "PID_Du": 0, + "SamplingWindow_P": 1, + "SamplingWindow_I": 1, + "SamplingWindow_D": 1, + "UclampMin_On": true, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, + "ReportingRateLimitNs": 1, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 5 + }, + { + "Name": "UiLowNoneBoost", + "PID_On": false, + "PID_Po": 0, + "PID_Pu": 0, + "PID_I": 0, + "PID_I_Init": 0, + "PID_I_High": 0, + "PID_I_Low": 0, + "PID_Do": 0, + "PID_Du": 0, + "SamplingWindow_P": 1, + "SamplingWindow_I": 1, + "SamplingWindow_D": 1, + "UclampMin_On": true, + "UclampMin_Init": 250, + "UclampMin_High": 0, + "UclampMin_Low": 0, + "ReportingRateLimitNs": 1, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 5 + } + ] +} diff --git a/powerhint-raven-mainline.json b/powerhint-raven-mainline.json new file mode 100644 index 00000000..89e38f0d --- /dev/null +++ b/powerhint-raven-mainline.json @@ -0,0 +1,1346 @@ +{ + "Nodes": [ + { + "Name": "MemFreq", + "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", + "Values": [ + "3172000", + "1014000", + "421000" + ], + "ResetOnInit": true + }, + { + "Name": "IntFreq", + "Path": "/sys/devices/platform/17000020.devfreq_int/devfreq/17000020.devfreq_int/min_freq", + "Values": [ + "533000", + "100000" + ], + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1098000", + "1401000", + "930000", + "1197000", + "1328000", + "1598000", + "1803000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPULittleClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "1024000", + "1197000", + "1491000", + "910000", + "1328000", + "1663000", + "1836000", + "1999000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUMidClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1197000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMaxFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", + "Values": [ + "9999999", + "984000", + "1426000", + "1826000", + "1277000", + "1582000", + "1745000", + "2048000", + "2401000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "CPUBigClusterMinFreq", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_min_freq", + "Values": [ + "9999999", + "1106000", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "GPUMinFreq", + "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", + "Values": [ + "762000", + "471000", + "400000", + "302000", + "151000" + ], + "ResetOnInit": true + }, + { + "Name": "DisplayWakeup", + "Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "PMQoSCpuDmaLatency", + "Path": "/dev/cpu_dma_latency", + "Values": [ + "44", + "1000" + ], + "HoldFd": true + }, + { + "Name": "CDCpuset", + "Path": "/dev/cpuset/camera-daemon/cpus", + "Values": [ + "0-3", + "4-7", + "0-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-high-group/cpus", + "Values": [ + "0-3", + "6-7" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", + "Values": [ + "0-3", + "4-5" + ], + "ResetOnInit": true + }, + { + "Name": "CDMidHighCpusetCpus", + "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", + "Values": [ + "0-3", + "4-7" + ], + "ResetOnInit": true + }, + { + "Name": "LimitFlashCurrent", + "Path": "vendor.camera.max_flash_current", + "Values": [ + "100", + "1500" + ], + "ResetOnInit": true, + "Type": "Property" + }, + { + "Name": "PowerHALRenderingState", + "Path": "vendor.powerhal.rendering", + "Values": [ + "EXPENSIVE_RENDERING", + "" + ], + "Type": "Property" + }, + { + "Name": "PowerHALCameraRunning", + "Path": "vendor.powerhal.camerarunning", + "Values": [ + "1", + "0" + ], + "Type": "Property", + "ResetOnInit": true + }, + { + "Name": "INTCAMFreq", + "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + }, + { + "Name": "TNRFreq", + "Path": "/sys/devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq", + "Values": [ + "664000", + "67000" + ], + "ResetOnInit": true + }, + { + "Name": "GPUPowerPolicy", + "Path": "/sys/devices/platform/1c500000.mali/power_policy", + "Values": [ + "always_on", + "adaptive" + ], + "ResetOnInit": true + }, + { + "Name": "BigControlTempSet", + "Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "MidControlTempSet", + "Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "LittleControlTempSet", + "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", + "Values": [ + "95000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "G3dControlTempSet", + "Path": "/dev/thermal/tz-by-name/G3D/trip_point_2_temp", + "Values": [ + "90000", + "80000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "BigSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "MidSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "LittleSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "G3dSwitchOnTempSet", + "Path": "/dev/thermal/tz-by-name/G3D/trip_point_1_temp", + "Values": [ + "70000", + "60000" + ], + "DefaultIndex": 0, + "ResetOnInit": false + }, + { + "Name": "CPU_LITTLE_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_MID_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "CPU_BIG_TSKIN_BYPASS", + "Path": "/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote_bypass", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 + }, + { + "Name": "TRUSTY_VIRTIO_HIGH", + "Path": "/sys/module/trusty_virtio/parameters/use_high_wq", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "TRUSTY_HIGH", + "Path": "/sys/module/trusty_core/parameters/use_high_wq", + "Values": [ + "1", + "0" + ] + }, + { + "Name": "Dex2oatThreads", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads", + "Values": [ + "1", + "2", + "4", + "6", + "8" + ], + "Type": "Property" + }, + { + "Name": "Dex2oatCPUSet", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set", + "Values": [ + "0,1,2,3", + "0,1,2,3,4,5", + "0,1,2,3,4,5,6,7" + ], + "Type": "Property" + } + ], + "Actions": [ + { + "PowerHint": "CDCPUSET_RESTRICTED", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDCPUSETCPUS_RESTRICTED", + "Node": "CDMidCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "CDMIDHIGHCPUSETCPUS_RESTRICTED", + "Node": "CDMidHighCpusetCpus", + "Duration": 1000, + "Value": "0-3" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "LAUNCH", + "Node": "GPUPowerPolicy", + "Duration": 5000, + "Value": "always_on" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_EXTEND" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "EnableProperty": "vendor.powerhal.camerarunning", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUMidClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPULittleClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPUBigClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPUMidClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_LAUNCH_EXTENDED", + "Node": "CPULittleClusterMaxFreq", + "Duration": 2000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "984000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1024000" + }, + { + "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1098000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "1426000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 1000, + "Value": "1197000" + }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 1000, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "MemFreq", + "Duration": 300, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUBigClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMaxFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_SHOT", + "Node": "CPUMidClusterMinFreq", + "Duration": 300, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "MemFreq", + "Duration": 1000, + "Value": "3172000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "IntFreq", + "Duration": 1000, + "Value": "533000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "INTCAMFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "CAMERA_BACKEND_BOOST", + "Node": "TNRFreq", + "Duration": 1000, + "Value": "664000" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_BIGMIDCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUBigClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPUMidClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "GCA_CAMERA_SHOT_ALLCPU", + "Node": "CPULittleClusterMinFreq", + "Duration": 3000, + "Value": "9999999" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "PowerHALCameraRunning", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "1826000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "1491000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "1401000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "302000" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "MemFreq", + "Duration": 0, + "Value": "1014000" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDCPUSET_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "CAMERA_VIDEO_RECORDING", + "Type": "MaskHint", + "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUBigClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPUMidClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "FIXED_PERFORMANCE", + "Node": "CPULittleClusterMinFreq", + "Duration": 0, + "Value": "9999999" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "930000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1197000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_70", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1328000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_80", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1598000" + }, + { + "PowerHint": "LOW_POWER_LITTLE_CLUSTER_90", + "Node": "CPULittleClusterMaxFreq", + "Duration": 3600000, + "Value": "1803000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_50", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "910000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_60", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1328000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_70", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1663000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_80", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1836000" + }, + { + "PowerHint": "LOW_POWER_MID_CLUSTER_90", + "Node": "CPUMidClusterMaxFreq", + "Duration": 3600000, + "Value": "1999000" + }, + { + "PowerHint": "LOW_POWER_CPU_50", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1277000" + }, + { + "PowerHint": "LOW_POWER_CPU_60", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1582000" + }, + { + "PowerHint": "LOW_POWER_CPU_70", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "1745000" + }, + { + "PowerHint": "LOW_POWER_CPU_80", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "2048000" + }, + { + "PowerHint": "LOW_POWER_CPU_90", + "Node": "CPUBigClusterMaxFreq", + "Duration": 3600000, + "Value": "2401000" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Node": "DisplayWakeup", + "Duration": 50, + "Value": "1" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "100" + }, + { + "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", + "Node": "LimitFlashCurrent", + "Duration": 0, + "Value": "1500" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "PowerHALRenderingState", + "Duration": 0, + "Value": "EXPENSIVE_RENDERING" + }, + { + "PowerHint": "EXPENSIVE_RENDERING", + "Node": "GPUMinFreq", + "Duration": 0, + "Value": "400000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FACE_UNLOCK_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMaxFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPUBigClusterMinFreq", + "Duration": 1000, + "Value": "9999999" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "TRUSTY_VIRTIO_HIGH", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "FP_BOOST", + "Node": "TRUSTY_HIGH", + "Duration": 1000, + "Value": "1" + }, + { + "PowerHint": "ML_ACC", + "Node": "PMQoSCpuDmaLatency", + "Duration": 2000, + "Value": "44" + } + ], + "AdpfConfig": [ + { + "Name": "REFRESH_120FPS", + "PID_On": true, + "PID_Po": 2, + "PID_Pu": 1, + "PID_I": 0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500, + "PID_Du": 0, + "UclampMin_On": true, + "UclampMin_Init": 232, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 83333330, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 15 + }, + { + "Name": "REFRESH_90FPS", + "PID_On": true, + "PID_Po": 2, + "PID_Pu": 1, + "PID_I": 0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500, + "PID_Du": 0, + "UclampMin_On": true, + "UclampMin_Init": 162, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 111111110, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 15 + }, + { + "Name": "REFRESH_60FPS", + "PID_On": true, + "PID_Po": 2, + "PID_Pu": 1, + "PID_I": 0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500, + "PID_Du": 0, + "UclampMin_On": true, + "UclampMin_Init": 162, + "UclampMin_High": 480, + "UclampMin_Low": 2, + "SamplingWindow_P": 1, + "SamplingWindow_I": 0, + "SamplingWindow_D": 1, + "ReportingRateLimitNs": 166666660, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 15 + }, + { + "Name": "UiHighBoostWithoutPid", + "PID_On": false, + "PID_Po": 0, + "PID_Pu": 0, + "PID_I": 0, + "PID_I_Init": 0, + "PID_I_High": 0, + "PID_I_Low": 0, + "PID_Do": 0, + "PID_Du": 0, + "SamplingWindow_P": 1, + "SamplingWindow_I": 1, + "SamplingWindow_D": 1, + "UclampMin_On": true, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, + "ReportingRateLimitNs": 1, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 5 + }, + { + "Name": "UiLowBoostWithoutPid", + "PID_On": false, + "PID_Po": 0, + "PID_Pu": 0, + "PID_I": 0, + "PID_I_Init": 0, + "PID_I_High": 0, + "PID_I_Low": 0, + "PID_Do": 0, + "PID_Du": 0, + "SamplingWindow_P": 1, + "SamplingWindow_I": 1, + "SamplingWindow_D": 1, + "UclampMin_On": true, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, + "ReportingRateLimitNs": 1, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 5 + }, + { + "Name": "UiLowNoneBoost", + "PID_On": false, + "PID_Po": 0, + "PID_Pu": 0, + "PID_I": 0, + "PID_I_Init": 0, + "PID_I_High": 0, + "PID_I_Low": 0, + "PID_Do": 0, + "PID_Du": 0, + "SamplingWindow_P": 1, + "SamplingWindow_I": 1, + "SamplingWindow_D": 1, + "UclampMin_On": true, + "UclampMin_Init": 250, + "UclampMin_High": 0, + "UclampMin_Low": 0, + "ReportingRateLimitNs": 1, + "EarlyBoost_On": false, + "EarlyBoost_TimeFactor": 0, + "TargetTimeFactor": 1, + "StaleTimeFactor": 5 + } + ] +} -- cgit v1.2.3 From 74cec483256dae72e94c82191b2ae25040039bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 28 Sep 2023 00:29:37 +0000 Subject: OWNERS: master -> main Change-Id: I77e5c821008a6acfb273b8dfb36608659b13c996 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 61b3e451..e434a1c6 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 -- cgit v1.2.3 From ed76e2420dfa185be32015c8c22d20cb58e1ced2 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:13:52 +0000 Subject: Update raven SVN to 71 Bug: 302612466 Change-Id: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 8d198baa..bb20cab2 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=70 + ro.vendor.build.svn=71 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From afe27a01390a08b9904130e5eca9f554e5007b4d Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:20 +0000 Subject: Update oriole SVN to 71 Bug: 302612466 Change-Id: If51fdd784e6f45e63331ce984e76632e2236a943 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index fbf37025..7075e01f 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=70 + ro.vendor.build.svn=71 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From 09c3f8abaaacf7b853a5defc6b7bc3f291646e89 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:26 +0000 Subject: Update raven SVN to 72 Bug: 302612466 Change-Id: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index bb20cab2..0833143b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=71 + ro.vendor.build.svn=72 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From e2f006d29c245aba42e75e9f8a448235834cd551 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:42:52 +0000 Subject: Update oriole SVN to 72 Bug: 302612466 Change-Id: I8dd3b2389683050f017bbc09946bce8a14e979e8 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 7075e01f..70f0b377 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=71 + ro.vendor.build.svn=72 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From 50e640cbe089b0a8e37409a349928792f2e34dee Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Sat, 23 Sep 2023 12:22:28 +0800 Subject: 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: Ifaca5cac8320e08790eed27a5c7121c60901f26e --- powerhint-oriole.json | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ powerhint-raven.json | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 0882f933..88c9b460 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -615,6 +615,66 @@ "Duration": 2000, "Value": "9999999" }, + { + "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": "692" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "202" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "GPUPowerPolicy", + "Duration": 5000, + "Value": "always_on" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "MemFreq", diff --git a/powerhint-raven.json b/powerhint-raven.json index 269791ef..21f3a4b2 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -614,6 +614,66 @@ "Duration": 2000, "Value": "9999999" }, + { + "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": "692" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "202" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "GPUPowerPolicy", + "Duration": 5000, + "Value": "always_on" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "MemFreq", -- cgit v1.2.3 From 12bb201d03604175565b9b1a46cf59ff3056d208 Mon Sep 17 00:00:00 2001 From: ClintChen Date: Wed, 4 Oct 2023 09:18:26 +0000 Subject: oriole: Enable build flag versioning for radio and bootloader Bug: 301142125 Change-Id: I943612ca22a468470b1ed739c032c89c63e793ae --- oriole/BoardConfig.mk | 3 +++ raven/BoardConfig.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index c428a833..d152319c 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -23,6 +23,9 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_ORIOLE_BOOTLOADER_DIR) + ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu #RBC# include_top device/google/pixel_tcu diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 462133a8..40950eb8 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -23,6 +23,9 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_RAVEN_BOOTLOADER_DIR) + ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu #RBC# include_top device/google/pixel_tcu -- cgit v1.2.3 From 95296f18736c250fa53c164476cd2de9b4b9748c Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 9 Oct 2023 19:56:46 +0000 Subject: raven: Replace NFC app with NFC apex Bug: 303286040 Test: Compiles (cherry picked from https://android-review.googlesource.com/q/commit:ba50cdd59a167ff3168129e321fad4a95a8888ef) Merged-In: Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa Change-Id: Ia234c14d666750f1c1dfeb22aa7f56fbd59593fa --- device-oriole.mk | 2 +- device-raven.mk | 2 +- device-slider.mk | 2 +- device-whitefin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 74d4f171..d48d8b7c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -141,7 +141,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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-raven.mk b/device-raven.mk index 88b981a9..0e62f465 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -147,7 +147,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libnfc-nci-raven.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-slider.mk b/device-slider.mk index 5cbab35d..5f2a741d 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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-whitefin.mk b/device-whitefin.mk index 0c366c81..090b93eb 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -79,7 +79,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st -- cgit v1.2.3 From 53f15c8a4d226910201602b95211d4ad34a52a82 Mon Sep 17 00:00:00 2001 From: guibing Date: Wed, 2 Aug 2023 17:13:35 +0000 Subject: powerhint: raviole: 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 test Change-Id: I2a3ca476354c0e920931749a285305f30f61d319 --- powerhint-oriole.json | 18 +++++++++--------- powerhint-raven.json | 18 +++++++++--------- powerhint-slider.json | 18 +++++++++--------- powerhint-whitefin.json | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 88c9b460..0f9afe09 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -142,7 +142,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "692", "1" @@ -151,7 +151,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "202", "0" @@ -160,7 +160,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "640" @@ -188,7 +188,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -234,7 +234,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -243,7 +243,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -252,7 +252,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -262,7 +262,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -498,7 +498,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" diff --git a/powerhint-raven.json b/powerhint-raven.json index 21f3a4b2..1f3c408c 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -141,7 +141,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "692", "1" @@ -150,7 +150,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "202", "0" @@ -159,7 +159,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "640" @@ -187,7 +187,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -233,7 +233,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -242,7 +242,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -251,7 +251,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -261,7 +261,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -497,7 +497,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" diff --git a/powerhint-slider.json b/powerhint-slider.json index bd5ab4c7..e7d781c9 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -150,7 +150,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "692", "1", @@ -160,7 +160,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "202", "0" @@ -169,7 +169,7 @@ }, { "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", + "Path": "/proc/vendor_sched/groups/sf/uclamp_min", "Values": [ "202", "107", @@ -179,7 +179,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "640" @@ -198,7 +198,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -243,7 +243,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -252,7 +252,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -261,7 +261,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "0", "1" @@ -270,7 +270,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-whitefin.json b/powerhint-whitefin.json index cc335bc9..3a1de82b 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -150,7 +150,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "692", "1", @@ -160,7 +160,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "202", "0" @@ -169,7 +169,7 @@ }, { "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", + "Path": "/proc/vendor_sched/groups/sf/uclamp_min", "Values": [ "202", "107", @@ -179,7 +179,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "640" @@ -198,7 +198,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -243,7 +243,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -252,7 +252,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -261,7 +261,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "0", "1" @@ -270,7 +270,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" -- cgit v1.2.3 From cff140b5fdbbd2b3b2752e4c1251724887748dc9 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 20 Oct 2023 11:38:52 -0700 Subject: thermal: align the setting VSKIN related sensors Bug: 302435949 Test: emul_temp Change-Id: Id2ea8911e577cab50b689223b2cc87cce512e23d --- thermal_info_config_oriole.json | 16 ++++++++-------- thermal_info_config_raven.json | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 1ec4b908..372e8516 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -148,8 +148,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], - "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, @@ -164,8 +164,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], - "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, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -219,8 +219,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], - "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, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -326,8 +326,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], - "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, diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 139bc227..c3289e2a 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -138,8 +138,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], - "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, @@ -154,8 +154,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], - "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, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -209,8 +209,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], - "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, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -316,8 +316,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], - "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, -- cgit v1.2.3 From 024c12af322f3daf3aa21eac4313d2ebe1b9022c Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:20 +0000 Subject: Update oriole SVN to 71 Bug: 302612466 Change-Id: If51fdd784e6f45e63331ce984e76632e2236a943 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index dada41b3..9cdd344b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=70 + ro.vendor.build.svn=71 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From 91dbbaf6a27095f064118f253958b172da8a3794 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:13:52 +0000 Subject: Update raven SVN to 71 Bug: 302612466 Change-Id: I8c74f60d0c0437585a1f4bf5ad9d43115ddcc8b1 (cherry picked from commit ed76e2420dfa185be32015c8c22d20cb58e1ced2) --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 1f70f370..665aeb84 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=70 + ro.vendor.build.svn=71 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From c56cc1ffe2b692a70f0a9d4037f00543794c3817 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:26 +0000 Subject: Update raven SVN to 72 Bug: 302612466 Change-Id: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 665aeb84..da9a172a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=71 + ro.vendor.build.svn=72 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From de8cd7d5e9611936c024988558237a12b4fda36f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:42:52 +0000 Subject: Update oriole SVN to 72 Bug: 302612466 Change-Id: I8dd3b2389683050f017bbc09946bce8a14e979e8 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 9cdd344b..de95099d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=71 + ro.vendor.build.svn=72 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From 08176b5882ebf16aed25d650aa474b3dc3d05c96 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 25 Oct 2023 15:10:37 -0600 Subject: 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: I9778ab070155d18d4c67f31c9ff39863e7ba34af --- AndroidProducts.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index c2c8efea..ce06e547 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -39,7 +39,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/factory_whitefin.mk COMMON_LUNCH_CHOICES := \ - aosp_slider-userdebug \ - aosp_whitefin-userdebug \ - aosp_oriole-userdebug \ - aosp_raven-userdebug + aosp_slider-trunk_staging-userdebug \ + aosp_whitefin-trunk_staging-userdebug \ + aosp_oriole-trunk_staging-userdebug \ + aosp_raven-trunk_staging-userdebug -- cgit v1.2.3 From 4fb3e74540a7be3badfc73f553cfb4b5d960dc5c Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 18:53:29 +0000 Subject: Adding Fast Pair extended IDs for Pixel 6 Adding the Fast Pair extended IDs for oriole and raven so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: Manually flashed a oriole & raven device and validated the FP bottom sheet is displayed on a nearby other device Change-Id: Iba09888de27f92e16ab0979a7d62e9a7c6505ff2 --- device-oriole.mk | 5 +++++ device-raven.mk | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 70f0b377..c6ae0ed9 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -280,3 +280,8 @@ endif # 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=oriole diff --git a/device-raven.mk b/device-raven.mk index 0833143b..faf89b18 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -291,3 +291,7 @@ endif # 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=raven -- cgit v1.2.3 From 6715a1002e4b73f62a1e233234a857e4ea5dcf61 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:07:47 +0000 Subject: Update raven SVN to 73 Bug: 302612466 Change-Id: Ie036112a3c0890629e5169991dc76c0407705b39 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index faf89b18..6a2f7585 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=72 + ro.vendor.build.svn=73 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From 0240e9137174abd21bcec6332f6a3e959437ac23 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 04:57:37 +0000 Subject: Update oriole SVN to 73 Bug: 302612466 Change-Id: Ib2893f0b721498f7c2b71377e79123765afd164f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index c6ae0ed9..a260d2d6 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=72 + ro.vendor.build.svn=73 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From 9926df8f8a71ffa478566550a68d86ff0fea1fca Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 25 Oct 2023 18:16:54 +0800 Subject: Split bootloader prebuilt to 24Q1 and trunk version Bug: 299879102 Change-Id: I048cfeecf8fcc06dab362819a5548db4c34d417e --- device-oriole.mk | 10 ++++++++++ device-raven.mk | 10 ++++++++++ device-slider.mk | 5 +++++ device-whitefin.mk | 5 +++++ oriole/BoardConfig.mk | 6 +++++- raven/BoardConfig.mk | 6 +++++- slider/BoardConfig.mk | 5 +++++ whitefin/BoardConfig.mk | 5 +++++ 8 files changed, 50 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4daef797..2f72272f 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -39,6 +39,11 @@ include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/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) @@ -230,6 +235,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk +endif # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 7d7171b3..5193afbd 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -39,6 +39,11 @@ include device/google/gs-common/touch/lsi/lsi.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g6_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/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) @@ -238,6 +243,11 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk +endif # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-slider.mk b/device-slider.mk index 5f2a741d..d519c4f2 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -105,6 +105,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk +endif # tetheroffload HAL PRODUCT_PACKAGES += \ diff --git a/device-whitefin.mk b/device-whitefin.mk index 090b93eb..914acc1a 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -88,6 +88,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk +endif # tetheroffload HAL PRODUCT_PACKAGES += \ diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index d152319c..0e2275b6 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -24,7 +24,11 @@ BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_ORIOLE_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 AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 40950eb8..1fe2152e 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -24,7 +24,11 @@ BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_RAVEN_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 AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 82425d28..e61c1858 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -15,6 +15,11 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider +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 USES_DEVICE_GOOGLE_RAVIOLE := true diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index 5b5a07a6..17d0cb18 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -15,6 +15,11 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin +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 USES_DEVICE_GOOGLE_RAVIOLE := true -- cgit v1.2.3 From 423f99e59b85567a31cbb0f81809cde7438363d7 Mon Sep 17 00:00:00 2001 From: Will Song Date: Fri, 27 Oct 2023 21:41:50 +0000 Subject: 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: Iae810239db56de48c73a4ff3f5fcebc7f805203b --- 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 00000000..37ebb5e7 --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Builtin Hooks] +jsonlint = true -- cgit v1.2.3 From c0c4781f17b3804c708ca3630d4c1161d5152b70 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 14:58:26 +0000 Subject: Revert "raven: 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: I9298ad5be151b96e3b77301490feb8aaee3231b1 Test: Compiles, device boots up --- device-oriole.mk | 2 +- device-raven.mk | 2 +- device-slider.mk | 2 +- device-whitefin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2f72272f..ff4e4686 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -146,7 +146,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayOriole diff --git a/device-raven.mk b/device-raven.mk index 5193afbd..ae2f63e8 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -152,7 +152,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libnfc-nci-raven.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st \ NfcOverlayRaven diff --git a/device-slider.mk b/device-slider.mk index d519c4f2..359ee564 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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-whitefin.mk b/device-whitefin.mk index 914acc1a..2063c901 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -79,7 +79,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st -- cgit v1.2.3 From 35ad1b0498c147fdb6d6003dca5c09b9dd58a73f Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 19:05:03 +0000 Subject: Revert "raviole(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:ec76544b6397c1efdbcc28b6de021dd1f1d7ce78) Merged-In: I2716c95474b35fff59726c1cb9a54e5ea42f941e Change-Id: I2716c95474b35fff59726c1cb9a54e5ea42f941e --- device-oriole.mk | 3 +- device-raven.mk | 3 +- .../packages/apps/Nfc/res/values/config.xml | 35 ++++++++++++++++++++++ oriole/rro_overlays/NfcOverlay/Android.bp | 9 ------ oriole/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ----------------- oriole/rro_overlays/NfcOverlay/OWNERS | 2 -- .../rro_overlays/NfcOverlay/res/values/config.xml | 35 ---------------------- .../packages/apps/Nfc/res/values/config.xml | 35 ++++++++++++++++++++++ raven/rro_overlays/NfcOverlay/Android.bp | 9 ------ raven/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ----------------- raven/rro_overlays/NfcOverlay/OWNERS | 2 -- .../rro_overlays/NfcOverlay/res/values/config.xml | 35 ---------------------- 12 files changed, 72 insertions(+), 150 deletions(-) create mode 100644 oriole/overlay/packages/apps/Nfc/res/values/config.xml delete mode 100644 oriole/rro_overlays/NfcOverlay/Android.bp delete mode 100644 oriole/rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 oriole/rro_overlays/NfcOverlay/OWNERS delete mode 100644 oriole/rro_overlays/NfcOverlay/res/values/config.xml create mode 100644 raven/overlay/packages/apps/Nfc/res/values/config.xml delete mode 100644 raven/rro_overlays/NfcOverlay/Android.bp delete mode 100644 raven/rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 raven/rro_overlays/NfcOverlay/OWNERS delete mode 100644 raven/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-oriole.mk b/device-oriole.mk index ff4e4686..58fcc15f 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -148,8 +148,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayOriole + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index ae2f63e8..32e8b814 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -154,8 +154,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayRaven + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ diff --git a/oriole/overlay/packages/apps/Nfc/res/values/config.xml b/oriole/overlay/packages/apps/Nfc/res/values/config.xml new file mode 100644 index 00000000..d1f5832c --- /dev/null +++ b/oriole/overlay/packages/apps/Nfc/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + true + + G9S9B + GB7N6 + GR1YH + + true + + 72 + 157 + false + + 36 + + + 106 + + diff --git a/oriole/rro_overlays/NfcOverlay/Android.bp b/oriole/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index 80de8916..00000000 --- a/oriole/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_raviole_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayOriole", - sdk_version: "current", - product_specific: true -} diff --git a/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml b/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4a..00000000 --- a/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/oriole/rro_overlays/NfcOverlay/OWNERS b/oriole/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713f..00000000 --- a/oriole/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml deleted file mode 100644 index d1f5832c..00000000 --- a/oriole/rro_overlays/NfcOverlay/res/values/config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - false - true - - G9S9B - GB7N6 - GR1YH - - true - - 72 - 157 - false - - 36 - - - 106 - - diff --git a/raven/overlay/packages/apps/Nfc/res/values/config.xml b/raven/overlay/packages/apps/Nfc/res/values/config.xml new file mode 100644 index 00000000..e17a0a22 --- /dev/null +++ b/raven/overlay/packages/apps/Nfc/res/values/config.xml @@ -0,0 +1,35 @@ + + + + true + true + + G8V0U + GF5KQ + GLU0G + + true + + 72 + 167 + false + + 36 + + + 106 + + diff --git a/raven/rro_overlays/NfcOverlay/Android.bp b/raven/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index 85b298c3..00000000 --- a/raven/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_raviole_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayRaven", - sdk_version: "current", - product_specific: true -} diff --git a/raven/rro_overlays/NfcOverlay/AndroidManifest.xml b/raven/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4a..00000000 --- a/raven/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/raven/rro_overlays/NfcOverlay/OWNERS b/raven/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713f..00000000 --- a/raven/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 48448 -include platform/packages/apps/Nfc:/OWNERS diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml deleted file mode 100644 index e17a0a22..00000000 --- a/raven/rro_overlays/NfcOverlay/res/values/config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - true - true - - G8V0U - GF5KQ - GLU0G - - true - - 72 - 167 - false - - 36 - - - 106 - - -- cgit v1.2.3 From 7b6a615aa86d4d65d0a75761392dcb07a966770a Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:13:03 +0000 Subject: Update oriole SVN to 74 Bug: 309529736 Change-Id: I46458735aaba542defde0ab3319d1afd61f051f4 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index a260d2d6..1338cd50 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=73 + ro.vendor.build.svn=74 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From d149063ee2d5b539d4b3caa866a0832203e12f2b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:14:20 +0000 Subject: Update raven SVN to 74 Bug: 309529736 Change-Id: If979440846ea1bb42448118fa778dc908e71c172 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 6a2f7585..cea65d3e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=73 + ro.vendor.build.svn=74 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From 30b7043080cfa8ceda3f5228320301f6d9dae17d Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Thu, 16 Nov 2023 04:37:55 +0000 Subject: gps: Enable Vzw SUPL OTDOA Bug: 310795649 Test: OTDOA test in b/310795649 Change-Id: I61e1fc51ac2f066025bd3ae57bb880c14fb0c5ed --- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.oriole | 2 +- location/gps_user.xml.raven | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 5db2845e..97c7d8bb 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.oriole b/location/gps.xml.oriole index 193802ce..a76f1533 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -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.raven b/location/gps.xml.raven index 7f6f390f..9a64d97f 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -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 b6ecc343..c2184c22 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.oriole b/location/gps_user.xml.oriole index 28e1ddc9..f09913a0 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -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.raven b/location/gps_user.xml.raven index b06b9d31..858732dc 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" -- cgit v1.2.3 From 31d7180356120142f43c97b9ddbdfc609fdbe0cb Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:18:38 +0000 Subject: Update raven SVN to 75 Bug: 313696499 Change-Id: Ia73889924434581a2a8b1fccbc6df045bb90774f --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index cea65d3e..c7e85311 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -186,7 +186,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=74 + ro.vendor.build.svn=75 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From b1bc52470f55098c7780bfc645e95962ca2e4b00 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:16:22 +0000 Subject: Update oriole SVN to 75 Bug: 313696499 Change-Id: I64ab75fb46b604e34c25ef538872afec6bb39314 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 1338cd50..db1dca86 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=74 + ro.vendor.build.svn=75 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From cd3dd4d199ea3c5786da12199c6dc9c28a65ebf1 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: Revert^2 "raven: Replace NFC app with NFC apex" c0c4781f17b3804c708ca3630d4c1161d5152b70 Bug: 303286040 Test: Compiles Change-Id: I51a882988a933836ebf9426c4a6548ee3a97aa42 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- device-slider.mk | 2 +- device-whitefin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index c47befc3..bd05f49d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -146,7 +146,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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-raven.mk b/device-raven.mk index 59cd0ba1..423e753c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -152,7 +152,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libnfc-nci-raven.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-slider.mk b/device-slider.mk index 359ee564..c0b67fa3 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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-whitefin.mk b/device-whitefin.mk index 2063c901..51612087 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -79,7 +79,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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 -- cgit v1.2.3 From 21db4433f7797b63775f3ba51956a53e2bca0811 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: Revert^2 "raviole(nfc): Modify NFC overlays for NFC apex" 35ad1b0498c147fdb6d6003dca5c09b9dd58a73f Bug: 303286040 Test: Compiles Change-Id: I0191f8f24a2dc028a0347766c057aefdc142ed3c --- device-oriole.mk | 3 +- device-raven.mk | 3 +- oriole/rro_overlays/NfcOverlay/Android.bp | 9 ++++++ oriole/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 +++++++++++++++++ oriole/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../rro_overlays/NfcOverlay/res/values/config.xml | 35 ++++++++++++++++++++++ raven/rro_overlays/NfcOverlay/Android.bp | 9 ++++++ raven/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 +++++++++++++++++ raven/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../rro_overlays/NfcOverlay/res/values/config.xml | 35 ++++++++++++++++++++++ 10 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 oriole/rro_overlays/NfcOverlay/Android.bp create mode 100644 oriole/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 oriole/rro_overlays/NfcOverlay/OWNERS create mode 100644 oriole/rro_overlays/NfcOverlay/res/values/config.xml create mode 100644 raven/rro_overlays/NfcOverlay/Android.bp create mode 100644 raven/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 raven/rro_overlays/NfcOverlay/OWNERS create mode 100644 raven/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/device-oriole.mk b/device-oriole.mk index bd05f49d..85d99bba 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -148,7 +148,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayOriole # SecureElement PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 423e753c..26eee6a5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -154,7 +154,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayRaven # SecureElement PRODUCT_PACKAGES += \ diff --git a/oriole/rro_overlays/NfcOverlay/Android.bp b/oriole/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 00000000..80de8916 --- /dev/null +++ b/oriole/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_raviole_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayOriole", + sdk_version: "current", + product_specific: true +} diff --git a/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml b/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 00000000..5241aa4a --- /dev/null +++ b/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/oriole/rro_overlays/NfcOverlay/OWNERS b/oriole/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 00000000..35e9713f --- /dev/null +++ b/oriole/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 00000000..d1f5832c --- /dev/null +++ b/oriole/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + true + + G9S9B + GB7N6 + GR1YH + + true + + 72 + 157 + false + + 36 + + + 106 + + diff --git a/raven/rro_overlays/NfcOverlay/Android.bp b/raven/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 00000000..85b298c3 --- /dev/null +++ b/raven/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_raviole_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayRaven", + sdk_version: "current", + product_specific: true +} diff --git a/raven/rro_overlays/NfcOverlay/AndroidManifest.xml b/raven/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 00000000..5241aa4a --- /dev/null +++ b/raven/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/raven/rro_overlays/NfcOverlay/OWNERS b/raven/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 00000000..35e9713f --- /dev/null +++ b/raven/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 00000000..e17a0a22 --- /dev/null +++ b/raven/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + true + true + + G8V0U + GF5KQ + GLU0G + + true + + 72 + 167 + false + + 36 + + + 106 + + -- cgit v1.2.3 From e0ee3084bf4b897b774fe145a8865250a5952c10 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Thu, 17 Aug 2023 16:19:10 -0700 Subject: 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:82455db12198a1a11441404f589d0e0fc1022ad8) Merged-In: Ic243f8fab8cb089da1f55247b6e1d6f78b746141 Change-Id: Ic243f8fab8cb089da1f55247b6e1d6f78b746141 --- powerhint-oriole.json | 45 ++++++++++++++++++++++++++++++++++++++++++-- powerhint-raven.json | 45 ++++++++++++++++++++++++++++++++++++++++++-- powerhint-slider.json | 50 +++++++++++++++++++++++++++++++++++++++++++++---- powerhint-whitefin.json | 50 +++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 178 insertions(+), 12 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 0f9afe09..890fa706 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -46,6 +46,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", @@ -73,6 +83,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", @@ -100,6 +120,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -140,6 +170,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/groups/ta/uclamp_min", @@ -245,9 +285,10 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-raven.json b/powerhint-raven.json index 1f3c408c..e3822afb 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -45,6 +45,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", @@ -72,6 +82,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", @@ -99,6 +119,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -139,6 +169,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/groups/ta/uclamp_min", @@ -244,9 +284,10 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-slider.json b/powerhint-slider.json index e7d781c9..73f513ac 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -45,6 +45,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", @@ -72,6 +82,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", @@ -99,6 +119,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -139,6 +169,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", @@ -254,18 +294,20 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 3a1de82b..eb09e263 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -45,6 +45,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", @@ -72,6 +82,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", @@ -99,6 +119,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -139,6 +169,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", @@ -254,18 +294,20 @@ "Name": "TAPreferIdle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { "Name": "FGPreferIdle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ - "0", - "1" + "1", + "0" ], + "DefaultIndex": 0, "ResetOnInit": true }, { -- cgit v1.2.3 From 52e8289e029569c3a63d55c61ddf7ed3bc284358 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 11 Sep 2023 19:52:29 -0700 Subject: powerhint: game mode tuning Test: test build Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3db0698451046183c32ed0509e54e49cc81fb107) Merged-In: I20d95d7dab694ddb8dbac199ae27c69dd965b3c6 Change-Id: I20d95d7dab694ddb8dbac199ae27c69dd965b3c6 --- powerhint-oriole.json | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ powerhint-raven.json | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ powerhint-slider.json | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ powerhint-whitefin.json | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 240 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 890fa706..7161acdd 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -585,6 +585,36 @@ "Duration": 5000, "Value": "1" }, + { + "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": "CPUBigClusterMaxFreq", @@ -1485,6 +1515,36 @@ "Duration": 0, "Value": "400000" }, + { + "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-raven.json b/powerhint-raven.json index e3822afb..1dc065c0 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -584,6 +584,36 @@ "Duration": 5000, "Value": "1" }, + { + "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": "CPUBigClusterMaxFreq", @@ -1466,6 +1496,36 @@ "Duration": 0, "Value": "400000" }, + { + "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-slider.json b/powerhint-slider.json index 73f513ac..d8755b16 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -494,6 +494,36 @@ "Duration": 5000, "Value": "107" }, + { + "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": "CPUBigClusterMaxFreq", @@ -1342,6 +1372,36 @@ "Duration": 0, "Value": "400000" }, + { + "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_SEVERE", "Node": "PMU_POLL", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index eb09e263..8576d18b 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -485,6 +485,36 @@ "Duration": 5000, "Value": "107" }, + { + "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": "CPUBigClusterMaxFreq", @@ -1327,6 +1357,36 @@ "Duration": 0, "Value": "400000" }, + { + "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_SEVERE", "Node": "BigControlTempSet", -- cgit v1.2.3 From 2a16b70d549395c77f2bcbc9bac1f721981653a8 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 14:00:23 +0800 Subject: Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: I201e622fc82223aeb7c7f30ce452c714f14ebf60 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ device-slider.mk | 2 ++ device-whitefin.mk | 2 ++ oriole/BoardConfig.mk | 2 ++ raven/BoardConfig.mk | 2 ++ slider/BoardConfig.mk | 2 ++ whitefin/BoardConfig.mk | 2 ++ 8 files changed, 20 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 85d99bba..6044ec66 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -41,6 +41,8 @@ include device/google/gs-common/touch/stm/stm11.mk GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk endif @@ -237,6 +239,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk endif diff --git a/device-raven.mk b/device-raven.mk index 26eee6a5..1549d074 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -41,6 +41,8 @@ include device/google/gs-common/touch/lsi/lsi.mk GOODIX_CONFIG_BUILD_VERSION := g6_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk endif @@ -245,6 +247,8 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk endif diff --git a/device-slider.mk b/device-slider.mk index c0b67fa3..75287bcc 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -107,6 +107,8 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk endif diff --git a/device-whitefin.mk b/device-whitefin.mk index 51612087..0e03eced 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -90,6 +90,8 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk endif diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 0e2275b6..5176a547 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -26,6 +26,8 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_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/raven/BoardConfig.mk b/raven/BoardConfig.mk index 1fe2152e..0fc37e8f 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -26,6 +26,8 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_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/slider/BoardConfig.mk b/slider/BoardConfig.mk index e61c1858..70a80b14 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -17,6 +17,8 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider 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/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index 17d0cb18..f78f6c88 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -17,6 +17,8 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin 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 -- cgit v1.2.3