From 1b6d2214effb1e3e3ad7f41eeb0de7311ba17091 Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Fri, 18 Feb 2022 21:32:16 +0800 Subject: [PATCH 01/60] powerhint: Update LITTLE default control_temp Align with gchip team recommendation 95C Bug: 220076055 Test: build Change-Id: Ieeffaa5c7e27a190b5d40df9e447aa14a913ba09 --- powerhint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerhint.json b/powerhint.json index 1c01386..c4c4bc0 100644 --- a/powerhint.json +++ b/powerhint.json @@ -329,7 +329,7 @@ "Name": "LittleControlTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", "Values": [ - "90000", + "95000", "80000" ], "DefaultIndex": 0, From 7be6c6eb6d02ac728a591fc59d7e3747c4f9dc04 Mon Sep 17 00:00:00 2001 From: chungkai Date: Thu, 14 Apr 2022 03:10:01 +0000 Subject: [PATCH 02/60] powerhal: update new boost uclamp value update new boost uclamp value since we update cpu capacity Test: None Bug: 224649226 Signed-off-by: chungkai Change-Id: I5c57242c042326907725bac0a024aed01506694b --- powerhint.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/powerhint.json b/powerhint.json index 819b4bd..2dc1abc 100644 --- a/powerhint.json +++ b/powerhint.json @@ -143,9 +143,9 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "108", + "126", "1", - "42" + "55" ], "ResetOnInit": true }, @@ -153,9 +153,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "125", - "65", - "30" + "160", + "85", + "39" ], "ResetOnInit": true }, @@ -163,7 +163,7 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "154", + "180", "512" ], "DefaultIndex": 0, @@ -436,7 +436,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "DEVICE_IDLE", @@ -448,7 +448,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "LAUNCH", @@ -1162,7 +1162,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", @@ -1194,7 +1194,7 @@ "PowerHint": "BOOST_60HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "108" + "Value": "126" }, { "PowerHint": "DISPLAY_IDLE", From fab20f9417e62e932b5a001fa5e0e98a82930bc3 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:19:05 +0800 Subject: [PATCH 03/60] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Change-Id: I8a5d4a90e5b2bdc2de9fdc41ef3576d99097ecda --- device-bluejay.mk | 3 +-- nfc/libnfc-hal-st-GB17L.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index cf052b5..652b4cc 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -109,7 +109,6 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ - device/google/bluejay/nfc/manifest_nfc.xml \ device/google/bluejay/nfc/manifest_se_bluejay.xml # PowerStats HAL diff --git a/nfc/libnfc-hal-st-GB17L.conf b/nfc/libnfc-hal-st-GB17L.conf index ed77586..ef1a858 100644 --- a/nfc/libnfc-hal-st-GB17L.conf +++ b/nfc/libnfc-hal-st-GB17L.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 0035a70..b7599c7 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From e59cda1c581e3d6367fe43df496cdc7109820c66 Mon Sep 17 00:00:00 2001 From: George Chang Date: Fri, 29 Apr 2022 23:55:32 +0800 Subject: [PATCH 04/60] Revert "Switch NFC from HIDL to AIDL" This reverts commit fab20f9417e62e932b5a001fa5e0e98a82930bc3. Reason for revert: Broken tests Bug: 230834308 Change-Id: Id25e27f37f1c3d727fa4943587ce3f57a20791b8 --- device-bluejay.mk | 3 ++- nfc/libnfc-hal-st-GB17L.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 652b4cc..cf052b5 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -109,6 +109,7 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ + device/google/bluejay/nfc/manifest_nfc.xml \ device/google/bluejay/nfc/manifest_se_bluejay.xml # PowerStats HAL diff --git a/nfc/libnfc-hal-st-GB17L.conf b/nfc/libnfc-hal-st-GB17L.conf index ef1a858..ed77586 100644 --- a/nfc/libnfc-hal-st-GB17L.conf +++ b/nfc/libnfc-hal-st-GB17L.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index b7599c7..0035a70 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From 0b6fa5c33c037a9394604b57bc3407c7b3edfe87 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:19:05 +0800 Subject: [PATCH 05/60] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Change-Id: Ieeb194305eb4878c3ca07be8da20ebe6484aaed5 --- device-bluejay.mk | 3 +-- nfc/libnfc-hal-st-GB17L.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b2d14c3..5ad014b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -109,7 +109,6 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf DEVICE_MANIFEST_FILE += \ - device/google/bluejay/nfc/manifest_nfc.xml \ device/google/bluejay/nfc/manifest_se_bluejay.xml # PowerStats HAL diff --git a/nfc/libnfc-hal-st-GB17L.conf b/nfc/libnfc-hal-st-GB17L.conf index ed77586..ef1a858 100644 --- a/nfc/libnfc-hal-st-GB17L.conf +++ b/nfc/libnfc-hal-st-GB17L.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 0035a70..b7599c7 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From c814fd4c90943bfa325218b1d1c1db598a8154c1 Mon Sep 17 00:00:00 2001 From: jimmyshiu Date: Wed, 20 Jul 2022 17:18:18 +0000 Subject: [PATCH 06/60] Remove universal touch boost Bug: 236781877 Test: PtsUiBench Change-Id: I038c56cce9eb5ec19b5e8619af16001b0f2ec0bf --- powerhint.json | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/powerhint.json b/powerhint.json index 6dda63d..560a6f8 100644 --- a/powerhint.json +++ b/powerhint.json @@ -144,7 +144,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", "1", "55" ], @@ -1287,32 +1286,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", From 0bc99f0f5bc741c325ba4319db8acdc82503956b Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Thu, 14 Jul 2022 21:43:56 +0000 Subject: [PATCH 07/60] Remove existing surfaceflinger uclamp boost configuration Remove existing surfaceflinger uclamp settings to not interfere with new adpf cpu hints for surfaceflinger Bug: b/239477143 Bug: b/195990840 Test: manual Change-Id: I763f1baec65f0cad341074f461a086776f7a5f5d --- conf/init.bluejay.rc | 8 ++++++++ powerhint.json | 22 ---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index d2a278d..1ee067c 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -30,3 +30,11 @@ on property:ro.boot.hardware.sku=GB17L on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.start.level 30 + +# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints +on property:sys.boot_completed=1 + trigger override-sf-uclamp + +on override-sf-uclamp + write /proc/vendor_sched/rt_uclamp_min 0 + write /proc/vendor_sched/sf_uclamp_min 0 diff --git a/powerhint.json b/powerhint.json index 560a6f8..0994619 100644 --- a/powerhint.json +++ b/powerhint.json @@ -158,16 +158,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "161", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -476,12 +466,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -500,12 +484,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", From 4fd718c2b6167a953924ba525864d2b9aa40ce9b Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 22 Jul 2022 06:36:58 +0000 Subject: [PATCH 08/60] Enable adpf cpu hints for SurfaceFlinger in device mk file Bug: b/239477143 Bug: b/195990840 Test: manual Change-Id: Ia41debdeedbec34c3d4b38eed509fd2d78ffdc88 --- device-bluejay.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index de133b0..2d96cfc 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -231,3 +231,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=6.4 \ ro.com.google.ime.height_ratio=1.05 + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true From f3accf1bdf18419c0185345ce3b10e60d681f305 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 3 Aug 2022 23:08:35 -0700 Subject: [PATCH 09/60] Remove FPS boost Bug: 241312961 Test: Build Change-Id: I5fbdc1063d2ac0c468d2a8c5b00293adac7d4179 Signed-off-by: Wei Wang --- powerhint.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/powerhint.json b/powerhint.json index 0994619..981e2d4 100644 --- a/powerhint.json +++ b/powerhint.json @@ -144,8 +144,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "1", - "55" + "1" ], "ResetOnInit": true }, @@ -1256,7 +1255,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", From 6e65d0182ded6ad290641fab23a8c70d883bb38d Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 16 Aug 2022 13:59:34 +0800 Subject: [PATCH 10/60] move bcmbt settings to gs-common Bug: 242661555 Test: build pass Change-Id: I09f5984b8336ed6892d3c894818bd28229ce1782 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 8d8121a..500bfae 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -34,7 +34,7 @@ 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/cs40l26/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk From e52a07f0644c14ceb9ec2202a944fddb9c724d79 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 26 Aug 2022 10:04:36 +0800 Subject: [PATCH 11/60] move bt packages to gs-common Bug: 242661555 Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test Change-Id: I73771988a47ec1484d04d4fb60fbca6da5eb512e --- device-bluejay.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index acbb58f..ef3aed8 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -155,10 +155,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ persist.bluetooth.firmware.selection=BCM.hcd -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf - # Set zram size PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size=2g From 719967bc08e9ccac4c75fa9d9c40d21e508f847c Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 5 Sep 2022 12:38:50 +0800 Subject: [PATCH 12/60] move insmod script to gs-common Bug: 243763292 Test: boot to home Change-Id: I16067fe1be303bd452d5dab0c78d652f4149772e --- conf/init.blueport.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.blueport.rc b/conf/init.blueport.rc index 75adb5a..6938159 100644 --- a/conf/init.blueport.rc +++ b/conf/init.blueport.rc @@ -33,7 +33,7 @@ on boot && property:ro.build.type=userdebug && \ property:persist.vendor.fingerprint.disable.fake.override=100 setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} -service insmod_sh_blueport /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_blueport /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg class main user root group root system From d72a519c3d7a22b487cfe9fd02ad4f9549d2087a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Tue, 13 Sep 2022 01:55:04 +0000 Subject: [PATCH 13/60] Set Lyric camera_hardware variable. Bug: 240478511 Test: presubmit Change-Id: I11ad27a5ef5c1b5e0aa39c73c45ce6de7e429282 --- device-bluejay.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 008008d..8ab73d9 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -42,6 +42,8 @@ else include device/google/gs101/fingerprint/udfps_factory.mk endif +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,bluejay) $(call soong_config_set,lyric,tuning_product,bluejay) $(call soong_config_set,google3a_config,target_device,bluejay) From c5244b60bee4262b94cc15c1e9071f02762993b8 Mon Sep 17 00:00:00 2001 From: Chase Wu Date: Mon, 12 Sep 2022 20:34:33 +0800 Subject: [PATCH 14/60] vibrator: disable f0 and redc compensation Since those feature was enabled in android T, disabling these features as android S version. Bug: 241353178 Test: check the value after device boot up Test: update PtsHapticsTestCases and run it Signed-off-by: Chase Wu Change-Id: I1b363136147beff334fba0ca1e065729dcfb57e4 --- device-bluejay.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index acbb58f..3c41238 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -222,7 +222,9 @@ PRODUCT_SHIPPING_API_LEVEL := 32 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.supported_primitives=243 + ro.vendor.vibrator.hal.supported_primitives=243 \ + ro.vendor.vibrator.hal.f0.comp.enabled=0 \ + ro.vendor.vibrator.hal.redc.comp.enabled=0 # Device features PRODUCT_COPY_FILES += \ From 01a91fcbfd5ca82460f956704012488028ea473f Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Wed, 14 Sep 2022 11:52:35 +0800 Subject: [PATCH 15/60] Add display shape config for bluejay Bug: 236935288 Test: make Change-Id: I22c556b70146bc0d7697fb762373d0921743799b --- .../frameworks/base/core/res/res/values/config.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml index a1b0ce3..80357b5 100644 --- a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml @@ -264,4 +264,17 @@ true + + + M 50 0 C 42.768298 0.20918843 40.38325 0.67140492 36.839844 1.4492188 C 32.88207 2.499408 31.55228 2.9412067 27.529297 4.6933594 C 22.757243 6.7717586 20.051023 9.0487475 17.677734 10.873047 C 14.896398 13.14348 12.520098 15.642526 10.375 18.316406 C 7.8943843 21.48606 6.0935469 24.386022 4.3515625 28.15625 C 1.8145748 33.95665 1.4214109 36.446413 0.90625 38.939453 C 0.29310087 41.906691 0.090606668 43.961689 0 50 L 0 2350 C 0.083036414 2356.0047 0.27049146 2357.7278 0.70507812 2360.4961 C 1.0552946 2362.727 1.7787856 2366.4728 4.1152344 2372.0391 C 5.8274884 2375.87 7.608122 2378.6647 10.011719 2381.8281 C 12.156817 2384.5019 14.6796 2387.128 17.460938 2389.3984 C 19.82277 2391.2952 22.788288 2393.4515 27.306641 2395.5898 C 30.772461 2397.23 33.05157 2397.9241 37.181641 2398.8828 C 41.654968 2399.8035 43.840728 2399.9069 50 2400 L 1030 2400 C 1036.1593 2399.9069 1038.345 2399.8035 1042.8184 2398.8828 C 1046.9485 2397.9241 1049.2276 2397.23 1052.6934 2395.5898 C 1057.2118 2393.4515 1060.1773 2391.2952 1062.5391 2389.3984 C 1065.3205 2387.128 1067.8432 2384.5019 1069.9883 2381.8281 C 1072.3919 2378.6647 1074.1725 2375.87 1075.8848 2372.0391 C 1078.2212 2366.4728 1078.9466 2362.727 1079.2969 2360.4961 C 1079.7314 2357.7278 1079.917 2356.0047 1080 2350 L 1080 50 C 1079.909 43.961692 1079.7068 41.906687 1079.0938 38.939453 C 1078.5787 36.446409 1078.1854 33.956648 1075.6484 28.15625 C 1073.9064 24.386018 1072.1057 21.48606 1069.625 18.316406 C 1067.4799 15.642522 1065.1037 13.143473 1062.3223 10.873047 C 1059.949 9.0487409 1057.2428 6.7717652 1052.4707 4.6933594 C 1048.4477 2.9412128 1047.118 2.4994066 1043.1602 1.4492188 C 1039.6168 0.67140026 1037.2317 0.20918958 1030 0 L 50 0 z From d5652b242dedc032a22d3a527b7e84677ea88ea5 Mon Sep 17 00:00:00 2001 From: Calvin Huang Date: Thu, 6 Oct 2022 23:55:03 +0000 Subject: [PATCH 16/60] Use ?= to set ro.com.google.ime.height_ratio So bluejay_ui_portrait_car can reset it. Test: lunch bluejay-userdebug && make Bug: 249173167 Change-Id: I5f5829fe00767238c720c6678b4301eafb40659e --- device-bluejay.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 02079c7..b1fa53a 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -231,6 +231,8 @@ PRODUCT_COPY_FILES += \ # Keyboard bottom padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=6.4 \ + +PRODUCT_PRODUCT_PROPERTIES ?= \ ro.com.google.ime.height_ratio=1.05 # Enable adpf cpu hint session for SurfaceFlinger From 11d6a8329d85039c82503863c64eb738357580f8 Mon Sep 17 00:00:00 2001 From: chungkai Date: Tue, 12 Jul 2022 10:05:36 +0000 Subject: [PATCH 17/60] Enable load kernel modules in parallel enable load kernel modules in parallel but load some specific modules in sequential Test: reboot more than 5000 times without failure Bug: 229794277 Change-Id: Ic4961389d58b5195d252dff15cbb92bb391caacc Signed-off-by: Chungkai Mei --- bluejay/BoardConfig.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index cb99800..e63f62d 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -20,6 +20,16 @@ else TARGET_SCREEN_DENSITY := 420 endif +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 +BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 + TARGET_BOARD_INFO_FILE := device/google/bluejay/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := bluejay USES_DEVICE_GOOGLE_BLUEJAY := true From 26cb019c7d631bb9894018c10e350b78c1b262e6 Mon Sep 17 00:00:00 2001 From: Anthony Stange Date: Wed, 19 Oct 2022 13:55:48 +0000 Subject: [PATCH 18/60] Add OnChipAccMask to gps.xml Bug: 249751526 Test: b/249751526#comment3 Change-Id: Ibc93db5f61f15aae968890c434077e61996f2961 --- gps.xml.b3 | 1 + gps_user.xml.b3 | 1 + 2 files changed, 2 insertions(+) diff --git a/gps.xml.b3 b/gps.xml.b3 index 99e3b58..d8f3fdf 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -84,6 +84,7 @@ EnableOnChipStopNotification="2" PowerMode="3" MinGpsWeekNumber="2216" + OnChipAccMask="50" /> Date: Thu, 3 Nov 2022 18:21:52 +0000 Subject: [PATCH 19/60] Enable fingerprint testing virtual HAL on B3 We set 4 projects for biometrics-jank e2e tests - B3 - O6 - P10 - C10 Test: forest test with atp config \ v2/biometrics/health/microbench/biometrics/biometrics-jank-suite Bug: 228638448 Bug: 236074209 Change-Id: Ida4f889db0845f391709f84224e7a2052337e841 --- device-bluejay.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 0d1c6d5..4765309 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -238,3 +238,8 @@ PRODUCT_PRODUCT_PROPERTIES ?= \ # Enable adpf cpu hint session for SurfaceFlinger PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ debug.sf.enable_adpf_cpu_hint=true + +# Biometrics virtual HAL for e2e testing +PRODUCT_PACKAGES_DEBUG += \ + android.hardware.biometrics.fingerprint-service.example + From 36aed12055e22a5a58eabf2a315ce6a86859280b Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 28 Nov 2022 14:17:15 +0800 Subject: [PATCH 20/60] use stm dump from gs-common Bug: 256521567 Test: adb bugreport Change-Id: Ieb64cd5e0f671f73aacc7ee73a514799a19a9cfc --- device-bluejay.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 56ea6dd..4bd5921 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -35,6 +35,7 @@ include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/stm/stm11.mk ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk From c60aa4bab12d531762787e1f98717067dcc1f0d4 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Tue, 6 Dec 2022 22:06:23 +0000 Subject: [PATCH 21/60] Disable HWUI adpf by default and enable in device.mk * Make HWUI disabled by default for vendors * Explicitly enable in supported devices * Consolidate flags for HWUI and SF Bug: b/261628396 Test: manual Change-Id: Icd420ada955ef2034a23f1e591ea95948cd06072 --- device-bluejay.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4bd5921..296c39e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -236,10 +236,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES ?= \ ro.com.google.ime.height_ratio=1.05 -# Enable adpf cpu hint session for SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - debug.sf.enable_adpf_cpu_hint=true - # Biometrics virtual HAL for e2e testing PRODUCT_PACKAGES_DEBUG += \ android.hardware.biometrics.fingerprint-service.example From 9578aa38c137ba4c3963482fd439e051f08f5f06 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Thu, 8 Dec 2022 05:20:20 +0000 Subject: [PATCH 22/60] Enable quick start for pixel devices Bug: 246218540 Test: build pass with `m -j` command Change-Id: Iee0d60b7a416490843badc637dff9c3ba9935e2d --- device-bluejay.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4765309..efdecbf 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -243,3 +243,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES_DEBUG += \ android.hardware.biometrics.fingerprint-service.example +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ + From 6ffba1554219d07955a1ae97e101c280c3b6b775 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Wed, 21 Dec 2022 00:57:36 +0000 Subject: [PATCH 23/60] WLC: Include the wireless_charger from gs-common Bug: 237600973 Change-Id: Ie61251922a6ec7a087a089902eaf2e5291e53342 Signed-off-by: Ken Yang --- device-bluejay.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4ff234d..af471d6 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -37,6 +37,9 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk +# wireless_charger HAL service due to healthd and batteryinfo dependency +include device/google/gs-common/wireless_charger/wireless_charger.mk + ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk else From 111ab5afbf276d99572a26341a07369546a64502 Mon Sep 17 00:00:00 2001 From: Chungkai Mei Date: Thu, 5 Jan 2023 12:41:46 +0000 Subject: [PATCH 24/60] Load vh_sched kernel module in parallel Bug: 237232510 Change-Id: I5c63f6938b1e74c246540d5964e547e3a21af79b Signed-off-by: Chungkai Mei --- bluejay/BoardConfig.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index e63f62d..ae13ab0 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -24,7 +24,6 @@ endif BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential -BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 From 51351265c494b2ea5daffd33daa74fc799aa9d5e Mon Sep 17 00:00:00 2001 From: peterym Date: Thu, 22 Sep 2022 10:40:20 +0000 Subject: [PATCH 25/60] thermal: more aggressive CPU throttling policy Bug: 247536326 Test: run burn8, MH, compile package Change-Id: I4598cfd27a9e8a4d50b340c39a606a6eec438670 --- powerhint.json | 116 ++++++++--------- thermal_info_config_bluejay.json | 210 ++++++++++++++++++++----------- 2 files changed, 195 insertions(+), 131 deletions(-) diff --git a/powerhint.json b/powerhint.json index 61a6176..e95c62c 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1324,349 +1324,349 @@ "Value": "400000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatThreads", "Duration": 0, "Value": "6" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3,4,5" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json index 92c197d..7676e82 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -238,91 +238,155 @@ "VirtualSensor":true, "TriggerSensor":"neutral_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-SKIN2", - "VIRTUAL-NEUTRAL", - "VIRTUAL-QUIET-NEUTRAL" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39.0", - "43.0", - "45.0", - "47.0", - "52.0", - "55.0" - ], - "HotHysteresis":[ - "0.0", - "1.9", - "1.9", - "1.9", - "1.9", - "1.9", - "1.9" - ], + "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":["1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "VrThreshold":"NAN", "Multiplier":0.001, - "SendPowerHint":true, "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-HINT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"neutral_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":["1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-CPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"neutral_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":["1.0", "1.0", "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.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 1500, 750, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3500, 2000, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"] + "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] + }, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.085, 0.085, 0.085, 0.064, 0.085, 0.085, 0.085], - "CdevCeiling": [3, 3, 6, 7, 8, 10, 10], - "LimitInfo": [0, 0, 0, 0, 8, 10, 10], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.08, 0.08, 0.08, 0.060, 0.08, 0.08, 0.08], - "CdevCeiling": [7, 7, 8, 9, 11, 13, 13], - "LimitInfo": [0, 0, 0, 0, 11, 13, 13], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S3M_VDD_CPUCL1", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.38, 0.38, 0.38, 0.285, 0.38, 0.38, 0.38], - "CdevCeiling": [11, 11, 14, 14, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 14, 16, 16], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2M_VDD_CPUCL2", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CPU-GPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"neutral_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"], + "Coefficient":["1.0", "1.0", "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, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] + }, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] }, { "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [0.455, 0.455, 0.455, 0.591, 0.455, 0.455, 0.455], - "CdevCeiling": [7, 7, 8, 9, 10, 11, 11], - "LimitInfo": [0, 0, 0, 0, 10, 11, 11], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + "CdevCeiling": [10, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] } ] }, @@ -1076,23 +1140,23 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S2S_VDD_G3D", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -1122,8 +1186,8 @@ "1.0", "1.0" ], - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 } ] -} +} \ No newline at end of file From 9761c696c098d006091167386c2be95f5e8084e5 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Fri, 6 Jan 2023 17:51:09 +0000 Subject: [PATCH 26/60] WLC: Remove unused wireless_charger service Bug: 264624634 Bug: 263830018 Change-Id: I50f0d450f0100f12f716f995e41601e9bd865d7c Signed-off-by: Ken Yang --- device-bluejay.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index e88fa48..78e9f33 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -37,9 +37,6 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -# wireless_charger HAL service due to healthd and batteryinfo dependency -include device/google/gs-common/wireless_charger/wireless_charger.mk - ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk else From 9d673b348f15d1b909eb973f273f5fddcf90d135 Mon Sep 17 00:00:00 2001 From: Luke Chang Date: Tue, 20 Dec 2022 17:15:20 +0000 Subject: [PATCH 27/60] powerhint: add CPU_LOAD_RESET rule Set minimum mif freq for 1st frame to avoid memlat can't reflect in time. Test: Build and check 1st frame boost Bug: 259275437 Bug: 263383561 Change-Id: I9d4e1d115b93fe88128a4e6132b773e5b958759c Signed-off-by: Luke Chang --- powerhint.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/powerhint.json b/powerhint.json index 22f81f3..db1c756 100644 --- a/powerhint.json +++ b/powerhint.json @@ -614,6 +614,12 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", From c4d6c5e19b187e14371a40922a68baed7fd3386d Mon Sep 17 00:00:00 2001 From: millerliang Date: Tue, 10 Jan 2023 11:23:20 +0000 Subject: [PATCH 28/60] audio:enable mmap and raw on BT AoC can support mmap on BT both playback and recording after gpar/322484. Bug: 232205959 Test: OboeTester Signed-off-by: millerliang Change-Id: I558510a92f87fa39c792d51b9d463a8a9d92f523 --- .../config/audio_policy_configuration.xml | 16 ++++++++-------- ...licy_configuration_a2dp_offload_disabled.xml | 10 +++++----- ...olicy_configuration_bluetooth_legacy_hal.xml | 10 +++++----- audio/bluejay/config/mixer_paths.xml | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/audio/bluejay/config/audio_policy_configuration.xml b/audio/bluejay/config/audio_policy_configuration.xml index 40785ff..e19268f 100644 --- a/audio/bluejay/config/audio_policy_configuration.xml +++ b/audio/bluejay/config/audio_policy_configuration.xml @@ -192,21 +192,21 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -217,9 +217,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml index 54ed107..6a4a2be 100644 --- a/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 9bcfa5f..2c08723 100644 --- a/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/bluejay/config/mixer_paths.xml b/audio/bluejay/config/mixer_paths.xml index af4517c..790b2c7 100644 --- a/audio/bluejay/config/mixer_paths.xml +++ b/audio/bluejay/config/mixer_paths.xml @@ -146,6 +146,7 @@ + @@ -380,6 +381,10 @@ + + + + @@ -394,6 +399,10 @@ + + + + @@ -588,6 +597,10 @@ + + + + @@ -596,6 +609,10 @@ + + + + > From d7e2862d31c96249ac7e6701064b0ed084100c84 Mon Sep 17 00:00:00 2001 From: Midas Chien Date: Wed, 18 Jan 2023 03:37:25 +0000 Subject: [PATCH 29/60] Display: disable idle timer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need to enable idle timer for project only support one refresh rate. Bug: 264952266 Test: sf idle doesnʼt enable Change-Id: I4a692cc60965922ed13f18b6579172a1e5878aae --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index e88fa48..5b387a4 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -135,8 +135,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts -# Display LBE +# Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=0 # Bluetooth Hal Extension test tools PRODUCT_PACKAGES_DEBUG += \ From 05b00d10bfea9f5ece10adaae3aaf7dff35cbd1b Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 10 Jan 2023 17:05:53 +0800 Subject: [PATCH 30/60] conf: setup vibrator permission and init cs40l26 HAL Move from hardware/google/pixel/vibrator/cs40l26/ Bug: 264625320 Test: HAL init properly. Change-Id: I0f39e6213d92db0f402b85aade488a34bf736f0e --- conf/init.bluejay.rc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index 1ee067c..7ee6ad9 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -38,3 +38,24 @@ on property:sys.boot_completed=1 on override-sf-uclamp write /proc/vendor_sched/rt_uclamp_min 0 write /proc/vendor_sched/sf_uclamp_min 0 + +# Haptics +on property:vendor.all.modules.ready=1 + mkdir /mnt/vendor/persist/haptics 0770 system system + chmod 770 /mnt/vendor/persist/haptics + chmod 440 /mnt/vendor/persist/haptics/cs40l26.cal + chown system system /mnt/vendor/persist/haptics + chown system system /mnt/vendor/persist/haptics/cs40l26.cal + + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us + + enable vendor.vibrator.cs40l26 From f8b6eb461e63f6a061e164972e56b5e0016f4e3c Mon Sep 17 00:00:00 2001 From: Kris Chen Date: Wed, 1 Feb 2023 16:33:27 +0800 Subject: [PATCH 31/60] Set `/dev/goodix_fp` permission on early-boot Bug: 264497933 Test: Passed PtsFingerprintTest#udfpsHalStateCheck. Change-Id: I4bc8b592b205a37d89d1cbe2a6cc7b918c028c1a --- conf/init.bluejay.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index 1ee067c..3d0e80e 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -15,7 +15,6 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet on post-fs-data # Fingerprint - chown system system /dev/goodix_fp exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app # Speaker amp permission From b757a3a61e66ffd12c9e1494cc10c82b3514195d Mon Sep 17 00:00:00 2001 From: George Date: Wed, 1 Feb 2023 18:06:07 +0800 Subject: [PATCH 32/60] [NFC] Set tag_intent_app_pref_supported Bug: 244272155 Test: atest android.permission.cts.NfcPermissionTest Test: atest NfcFeatureFlagTest Change-Id: Idc311bbab5427dad5290162cc1f100716cb011e0 --- bluejay/overlay/packages/apps/Nfc/res/values/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/bluejay/overlay/packages/apps/Nfc/res/values/config.xml b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml index 84169a0..cf88ab2 100644 --- a/bluejay/overlay/packages/apps/Nfc/res/values/config.xml +++ b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml @@ -21,4 +21,5 @@ GX7AS GB17L + true From c1296ab940ad56c3e19e8e4e182d4e4624375aee Mon Sep 17 00:00:00 2001 From: Kris Chen Date: Tue, 21 Feb 2023 15:37:31 +0800 Subject: [PATCH 33/60] Remove the redundant g7 ta loading in init.xxx.rc Bug: 264646112 Test: fingerprint works fine after device reboot Change-Id: Ib0e0d55625d6376289d42ef96bbf067ed17715b9 --- conf/init.bluejay.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index f0ea38f..6708334 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -14,9 +14,6 @@ on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_complet write /sys/class/spi_master/spi11/spi11.0/glove_mode 01 on post-fs-data - # Fingerprint - exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app - # Speaker amp permission chmod 644 /mnt/vendor/persist/audio/speaker.cal From 830adc99d17af491703a08777b2ed8dbeefe29ea Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Wed, 22 Feb 2023 21:50:33 +0800 Subject: [PATCH 34/60] haptics: update hapitcs sink and slot setting Bug: 270023634 Test: trigger audio coupled haptics via sound picker app Change-Id: I56368f7a6a5097825ea89dfba3880cae1b92f1e7 --- audio/bluejay/config/mixer_paths.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/bluejay/config/mixer_paths.xml b/audio/bluejay/config/mixer_paths.xml index 790b2c7..4ee1f7b 100644 --- a/audio/bluejay/config/mixer_paths.xml +++ b/audio/bluejay/config/mixer_paths.xml @@ -40,7 +40,7 @@ - + From 4d3a27df78c7dab0bface2efd3b4dc62faae6f19 Mon Sep 17 00:00:00 2001 From: Jeff Pu Date: Thu, 2 Mar 2023 21:31:21 +0000 Subject: [PATCH 35/60] Remove fingerprint virtual hal from individual pixel device mk files since it is included in common one Bug: 270940857 Test: manual build Change-Id: I2a39eae0b849f35a9304e49ca7d0f83995c31871 --- device-bluejay.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4819420..37f1b5a 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -237,10 +237,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES ?= \ ro.com.google.ime.height_ratio=1.05 -# Biometrics virtual HAL for e2e testing -PRODUCT_PACKAGES_DEBUG += \ - android.hardware.biometrics.fingerprint-service.example - # Setup Wizard device-specific settings PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ From d4b713a196af5c42298cd941e95a9e4c05ecc36a Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Mon, 5 Dec 2022 21:58:50 +0000 Subject: [PATCH 36/60] device/bluejay: Add adaptive haptics props Add default adaptive haptics props for bluejay. Bug: 198239103 Test: Verified functionality Change-Id: I43a0dc0a84d682d8f71ae4ebac14cc123bd60ec4 Signed-off-by: Chris Paulo --- device-bluejay.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index d040cd4..7203de7 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -221,10 +221,16 @@ endif PRODUCT_SHIPPING_API_LEVEL := 32 # Vibrator HAL +ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.supported_primitives=243 \ ro.vendor.vibrator.hal.f0.comp.enabled=0 \ - ro.vendor.vibrator.hal.redc.comp.enabled=0 + ro.vendor.vibrator.hal.redc.comp.enabled=0 \ + persist.vendor.vibrator.hal.context.enable=false \ + persist.vendor.vibrator.hal.context.scale=40 \ + persist.vendor.vibrator.hal.context.fade=true \ + persist.vendor.vibrator.hal.context.cooldowntime=1600 \ + persist.vendor.vibrator.hal.context.settlingtime=5000 # Device features PRODUCT_COPY_FILES += \ From b8a9fbf2db903504794a077264c5952a96b1a7a5 Mon Sep 17 00:00:00 2001 From: George Chang Date: Thu, 9 Mar 2023 08:49:01 +0000 Subject: [PATCH 37/60] [NFC] Add antenna position coordinates Bug: 272406680 Test: manual Change-Id: I219ebe937a57e02f0ba7d1701eb4dbe356c9d657 --- .../overlay/packages/apps/Nfc/res/values/config.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bluejay/overlay/packages/apps/Nfc/res/values/config.xml b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml index cf88ab2..5610991 100644 --- a/bluejay/overlay/packages/apps/Nfc/res/values/config.xml +++ b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml @@ -22,4 +22,14 @@ GB17L true + + 70 + 150 + false + + 36 + + + 83 + From 6bac44096a3b2e8e121c4230fa904c2aec7a0482 Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 22 Mar 2023 18:23:16 +0000 Subject: [PATCH 38/60] Remove unused dimen auth_ripple_alpha_in_duration Bug: 274785453 Test: device builds Change-Id: I256a62c02ba499a43ded9d6c8cf84df7be11a0ae --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index c57de12..5e4f716 100644 --- a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -49,10 +49,6 @@ 56px - - 0 - 16px From 54644ec14c59e86f886f0fbbc9b84c5bdc7ca722 Mon Sep 17 00:00:00 2001 From: chenkris Date: Thu, 23 Mar 2023 07:43:22 +0000 Subject: [PATCH 39/60] Move udfps antispoof property to common g7 folder Bug: 270657514 Test: authenticate fake finger Change-Id: Ie67c13f6ab9e420b66a8e1dc77a9b27fcde8b6e6 --- conf/init.blueport.rc | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/conf/init.blueport.rc b/conf/init.blueport.rc index 6938159..bd69d18 100644 --- a/conf/init.blueport.rc +++ b/conf/init.blueport.rc @@ -20,19 +20,6 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_blueport -# Overrides fingerprint antispoof if following persist sysprops are set -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=0 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=1 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - -on boot && property:ro.build.type=userdebug && \ - property:persist.vendor.fingerprint.disable.fake.override=100 - setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} - service insmod_sh_blueport /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg class main user root From e3e61f15bc75a85ec2ee590ef1960259375b81dd Mon Sep 17 00:00:00 2001 From: Leo Liou Date: Fri, 17 Mar 2023 16:31:55 +0800 Subject: [PATCH 40/60] bluejay: conf: run ufs ffu script after boot complete The ufs script is to work for ffu preparing. If device's ufs has an old firmware, the script will copy the valid firmware into disk and wait for ffu update on bootloader. Bug: 273305212 Test: full build and test ffu update Change-Id: Ib5e2c57494ee22c33b93f1eda0e72049dcd12d16 Signed-off-by: Leo Liou --- device-bluejay.mk | 2 ++ storage/Android.bp | 27 +++++++++++++++++++++++++++ storage/storage.bluejay.rc | 7 +++++++ storage/ufs_firmware_update.sh | 19 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 storage/Android.bp create mode 100644 storage/storage.bluejay.rc create mode 100755 storage/ufs_firmware_update.sh diff --git a/device-bluejay.mk b/device-bluejay.mk index 6663f06..62e97f3 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -247,3 +247,5 @@ PRODUCT_PRODUCT_PROPERTIES ?= \ PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ +# UFS: the script is used to select the corresponding firmware to run FFU. +PRODUCT_PACKAGES += ufs_firmware_update.sh diff --git a/storage/Android.bp b/storage/Android.bp new file mode 100644 index 0000000..595857a --- /dev/null +++ b/storage/Android.bp @@ -0,0 +1,27 @@ +// +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: [ + "//device/google/bluejay:device_google_bluejay_license", + ], +} + +sh_binary { + name: "ufs_firmware_update.sh", + src: "ufs_firmware_update.sh", + init_rc: ["storage.bluejay.rc"], + vendor: true, +} diff --git a/storage/storage.bluejay.rc b/storage/storage.bluejay.rc new file mode 100644 index 0000000..9873325 --- /dev/null +++ b/storage/storage.bluejay.rc @@ -0,0 +1,7 @@ +on property:sys.boot_completed=1 + # Copy ufs firmware to disk + start ufs_firmware_update + +service ufs_firmware_update /vendor/bin/ufs_firmware_update.sh + disabled + oneshot diff --git a/storage/ufs_firmware_update.sh b/storage/ufs_firmware_update.sh new file mode 100755 index 0000000..d118115 --- /dev/null +++ b/storage/ufs_firmware_update.sh @@ -0,0 +1,19 @@ +#!/vendor/bin/sh +# +# The script belongs to the feature of UFS FFU via OTA: go/p23-ffu-ota +# Its purpose is to copy the corresponding firmware into partition for UFS FFU. + +ufs_dev="/dev/sys/block/bootdevice" +fw_dir="/vendor/firmware" +blk_dev="/dev/block/by-name/fips" + +vendor=$(cat ${ufs_dev}/vendor | tr -d "[:space:]") +model=$(cat ${ufs_dev}/model | tr -d "[:space:]") +rev=$(cat ${ufs_dev}/rev | tr -d "[:space:]") + +file=$(find ${fw_dir} -name "*${vendor}${model}${rev}*" | head -n 1) +if [ -n "$file" ]; then + # The first 4KB block at fips partition has been occupied, and unused space begins from 4 KB + # Refer to: go/pixel-mp-ffu-ota-1p + dd if="$file" of=$blk_dev bs=4k seek=1 +fi From a235af6ad280ad823d4ddbfbb3c368540ac9ebdb Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Tue, 7 Mar 2023 19:48:26 +0000 Subject: [PATCH 41/60] powerhint.json: Update uclamp_min hint to account for margin Upstream has fixed relationship between uclamp_min and margin which means uclamp_min value between 80-100% of capacity of the CPU is a valid value and will not cause upmigration. To keep the current hints in powerhint.json the same, we must update uclamp_min to be capacity_orig_of(medium_cpu) + 1. This change is dependent on uclamp vs fits margin in GKI, vendor modules. And an improvement in sched_pixel to ignore the 25% boost if the only reason to request the frequency is uclamp_min. To cater for the later - we multiply each uclamp_min value with 1.25 - except ones that look intentionally set around capacity boundaries. Bug: 261695590 Test: PtsUiBench Signed-off-by: Qais Yousef Change-Id: I873b6abe4b05f2d3c74fe7e84b634390be779506 --- powerhint.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/powerhint.json b/powerhint.json index 08e80e1..815cf78 100644 --- a/powerhint.json +++ b/powerhint.json @@ -143,7 +143,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1" ], "ResetOnInit": true @@ -152,7 +152,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -161,8 +161,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -541,13 +541,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1855,7 +1855,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" } ], "AdpfConfig": [ @@ -1871,8 +1871,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1895,8 +1895,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1919,8 +1919,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1946,9 +1946,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1970,9 +1970,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1994,7 +1994,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, From 771ba212e2b73e673fdbcfa3cc575f728a82d7e9 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Thu, 13 Apr 2023 10:02:37 +0000 Subject: [PATCH 42/60] [Quickstart] Turn off QS on legacy Pixels Bug: 277898824 Change-Id: I2faa36894265e373b62c500928d24a0128f9fafb Test: manually test --- device-bluejay.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 603b33e..4d9ed6b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -242,8 +242,3 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES ?= \ ro.com.google.ime.height_ratio=1.05 - -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - From adbf67d1de3243dfb146304f48d98dc75d412caa Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Fri, 14 Apr 2023 01:13:36 +0000 Subject: [PATCH 43/60] Revert "[Quickstart] Turn off QS on legacy Pixels" Revert submission 22606975-turn off qs Reason for revert: confirm with team that this CL submit too early and need to rollback then submit again at 4/19. Reverted changes: /q/submissionid:22606975-turn+off+qs Change-Id: I24d478f4d49d0e1685e3ad797d6b3bc97967f1a6 --- device-bluejay.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4d9ed6b..603b33e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -242,3 +242,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES ?= \ ro.com.google.ime.height_ratio=1.05 + +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ + From 647d2d0ae1ec240e0b580c2495a5a09e3817f30b Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Tue, 18 Apr 2023 09:30:46 +0000 Subject: [PATCH 44/60] Revert^2 "[Quickstart] Turn off QS on legacy Pixels" adbf67d1de3243dfb146304f48d98dc75d412caa Change-Id: I748aab3d3ac6f9877da107a804e390d85e67a3fa --- device-bluejay.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 226e5c4..161d807 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -243,9 +243,5 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES ?= \ ro.com.google.ime.height_ratio=1.05 -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # UFS: the script is used to select the corresponding firmware to run FFU. PRODUCT_PACKAGES += ufs_firmware_update.sh From 83fc0d5f61b736b7106123119584d26905fc5f79 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 20 Apr 2023 18:43:34 +0800 Subject: [PATCH 45/60] Add device mk OWNERS Bug: 278167548 Change-Id: Id74de9d2d1de889bb72ff83e06a38f3715b4fd0a --- OWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OWNERS b/OWNERS index 1451bd8..79003ba 100644 --- a/OWNERS +++ b/OWNERS @@ -1 +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 From 72b0286c5a82dbde2ab437bbc6ae3cab78d64eb1 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 3 May 2023 12:26:26 -0700 Subject: [PATCH 46/60] Add wakeup interrupt mappings Test: Manually inspect the output of: `dumpsys batterystats --wakeups` Bug: 271922941 Change-Id: I2087d405fa71721267b600afb2fb38bf0e79cef9 --- .../base/core/res/res/xml/irq_device_map.xml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 bluejay/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml diff --git a/bluejay/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/bluejay/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml new file mode 100644 index 0000000..6686c1b --- /dev/null +++ b/bluejay/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -0,0 +1,36 @@ + + + + + Alarm + + + Wifi + + + Cellular_data + + + Sound_trigger + + + Sensor + + + From 7209a892070dabc09111c7a246171edcc1d75484 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Thu, 30 Mar 2023 11:12:13 +0800 Subject: [PATCH 47/60] thermal: Update config for stats Bug: 259903201 Test: local build and verify stats Change-Id: Id856d8f3a8c7ee74d2913072dab7dec52946af53 --- thermal_info_config_bluejay.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json index e3cd3c2..6d90a20 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -1189,5 +1189,25 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [2.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } \ No newline at end of file From d336cc56914ff071bda4873426b2405e20c8fab9 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 10 May 2023 10:33:21 +0000 Subject: [PATCH 48/60] The dvfs headroom was split into its own knob. Update to use it. util_threshold only controls migration margin now. dvfs headroom has its own new knob. Bug: 261705301 Signed-off-by: Qais Yousef Change-Id: I4b179de4ce3b178c069a9a12e9ba2dee2cdeb23f --- powerhint.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/powerhint.json b/powerhint.json index 815cf78..0a066cb 100644 --- a/powerhint.json +++ b/powerhint.json @@ -130,6 +130,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100 1078 1024" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -974,6 +984,12 @@ "Duration": 0, "Value": "1100 1078 1024" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100 1078 1024" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", From 9c0fa9d875d889c9e8e058dce935021e62ca0f15 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 13 May 2023 22:38:14 +0000 Subject: [PATCH 49/60] Update bluejay SVN to 36 Bug: 282371465 Change-Id: I358a14b86c08d9d41e550804c2d02db0beaae8a6 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 98c35e3..556a9e2 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -122,7 +122,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 8993ac7da1e1b245b7dbdf71abb7a263dbbaa21c Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Mon, 15 May 2023 02:32:20 +0000 Subject: [PATCH 50/60] bluejay: remove customizedMaxCachedProcesses With project Snowbird in U, the MaxCachedProcesses is 1024 by default Bug: 278086134 Test: Build Change-Id: I9b845e68566ca2b0bf3ece9034aa6e8b7367f8b9 --- bluejay/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml index 1a3ac0b..aa79a3a 100644 --- a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml @@ -169,9 +169,6 @@ 0.32 - - 64 - 2 3 From 9f74db7265a8c54573aadefe51f29a18408b6cf1 Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 16 May 2023 17:32:39 +0800 Subject: [PATCH 51/60] Update cs40l26 modprobe modules Bug: 278018625 Test: Driver probed and checked lsmod. Change-Id: I189dac8c6c3cbefff8b7607e901a3a91295cb4ec --- init.insmod.bluejay.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/init.insmod.bluejay.cfg b/init.insmod.bluejay.cfg index 7d3c2d7..26297a5 100644 --- a/init.insmod.bluejay.cfg +++ b/init.insmod.bluejay.cfg @@ -8,8 +8,7 @@ # Modules here will be loaded *after* all common modules modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-i2c.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko +modprobe|cs40l26-i2c.ko modprobe|ftm5.ko modprobe|sec_touch.ko modprobe|snd-soc-cs40l26.ko From c2b3df519dab1a2fdbbc79d5e55b4440ec3ad95f Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 16 May 2023 16:17:10 +0800 Subject: [PATCH 52/60] Revert "haptics: update hapitcs sink and slot setting" This reverts commit 830adc99d17af491703a08777b2ed8dbeefe29ea. Bug: 278018625 Test: Check audio coupled haptics at the sound preview app. Change-Id: I61dc4079a2eef206568b4e548794198485511f6c --- audio/bluejay/config/mixer_paths.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/bluejay/config/mixer_paths.xml b/audio/bluejay/config/mixer_paths.xml index 4ee1f7b..790b2c7 100644 --- a/audio/bluejay/config/mixer_paths.xml +++ b/audio/bluejay/config/mixer_paths.xml @@ -40,7 +40,7 @@ - + From 9602aa3f1915bc16517102aa34f76df4bb4575cc Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 23 May 2023 20:32:05 +0000 Subject: [PATCH 53/60] Update bluejay SVN to 37 Bug: 282371465 Change-Id: Ic0c0fd1c8daeda0825cc9e77c687104bdc49376f --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 556a9e2..849524c 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -122,7 +122,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=36 + ro.vendor.build.svn=37 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 538ea9fede8d3c923686c61b7aad5c2778d0d7ed Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 26 May 2023 19:20:28 +0000 Subject: [PATCH 54/60] Update bluejay SVN to 38 Bug: 282371465 Change-Id: I2693b422c57aefcd39d48797ca155cadff17cb35 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 849524c..abf6739 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -122,7 +122,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=38 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 9803eae60be5ab67217500e08b1621201076e159 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Thu, 1 Jun 2023 20:50:35 +0000 Subject: [PATCH 55/60] Remove rt_uclamp_min and sf_uclamp_min rt_uclamp_min and sf_uclamp_min have been made redundant in Pixel by ADPF for sf, so we are just going to remove them outright rather than worrying about overriding them later Bug: 285248880 Test: manual Change-Id: If0ea3e8031205d23698cea8c2aad4e7b541bee2a --- conf/init.bluejay.rc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index 6708334..7378c6e 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -27,14 +27,6 @@ on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.start.level 30 -# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints -on property:sys.boot_completed=1 - trigger override-sf-uclamp - -on override-sf-uclamp - write /proc/vendor_sched/rt_uclamp_min 0 - write /proc/vendor_sched/sf_uclamp_min 0 - # Haptics on property:vendor.all.modules.ready=1 mkdir /mnt/vendor/persist/haptics 0770 system system From 4143a2bea5561b3fec283e26f2afbf599aa3e38a Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 17 Feb 2023 15:33:33 -0800 Subject: [PATCH 56/60] dck: add SE capability property Bug: 285390995 Test: boot cheetah; check logs to see that SE property is used Change-Id: I413b80530f585317ec272383c9027c7725c8ea77 Signed-off-by: Jeffrey Carlyle --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 5878afb..323ac8f 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -127,7 +127,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/bluejay/prebuilts From 9ee30193ee51b78c9274552f71c2067a0b64d6aa Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sun, 4 Jun 2023 02:20:38 +0000 Subject: [PATCH 57/60] Update bluejay SVN to 39 Bug: 285692955 Change-Id: I41b873f633343cde5bf8fd700cdf20a5e2b6cf77 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index abf6739..dbbb22d 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -122,7 +122,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=38 + ro.vendor.build.svn=39 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 42bc615c70980252934b4017ed59d91fda32a167 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sun, 4 Jun 2023 02:21:53 +0000 Subject: [PATCH 58/60] Update bluejay SVN to 40 Bug: 285692955 Change-Id: I78cce2638a15b48add7176c4ae037b317336789f --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index dbbb22d..e1615b0 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -122,7 +122,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=39 + ro.vendor.build.svn=40 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 0b2a6b2738cb48c4d82084e126c7ff54505481c2 Mon Sep 17 00:00:00 2001 From: paulsu Date: Thu, 8 Jun 2023 10:28:41 +0000 Subject: [PATCH 59/60] Create group throttle powerhint Test: Local test Bug: 280258727 Change-Id: Ie6c49fb9c9cab266306987346051709ddd3ada04 Signed-off-by: paulsu --- powerhint.json | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/powerhint.json b/powerhint.json index 0a066cb..ec48bd8 100644 --- a/powerhint.json +++ b/powerhint.json @@ -490,6 +490,26 @@ "0,1,2,3,4,5,6,7" ], "Type": "Property" + }, + { + "Name": "Dex2oatGroup", + "Path": "/proc/vendor_sched/dex2oat_ug", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "UgBgGroupThrottle", + "Path": "/proc/vendor_sched/ug_bg_group_throttle", + "Values": [ + "512", + "308" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -1525,6 +1545,12 @@ "Duration": 0, "Value": "0,1,2,3,4,5" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", @@ -1591,6 +1617,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", @@ -1663,6 +1695,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", @@ -1723,6 +1761,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", @@ -1807,6 +1851,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", From 1690c6ee2660cf2853e5d5f79e3e1a5f6698b28a Mon Sep 17 00:00:00 2001 From: paulsu Date: Wed, 14 Jun 2023 05:24:40 +0000 Subject: [PATCH 60/60] Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default Bug: 280258727 Test: Found regression in b/286002292, local test. Change-Id: Ia1e738be922799f2f18493143bb9aa0c2b3fbfa3 Signed-off-by: paulsu --- powerhint.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/powerhint.json b/powerhint.json index ec48bd8..51f0df9 100644 --- a/powerhint.json +++ b/powerhint.json @@ -500,16 +500,6 @@ ], "DefaultIndex": 0, "ResetOnInit": true - }, - { - "Name": "UgBgGroupThrottle", - "Path": "/proc/vendor_sched/ug_bg_group_throttle", - "Values": [ - "512", - "308" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [