From 495006966fe7219723ca8aba252d3e91080568ca Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:19:05 +0800 Subject: [PATCH 01/50] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Merged-In: Ieeb194305eb4878c3ca07be8da20ebe6484aaed5 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 e9801b8..aced5b9 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 d38d3164125a96cab49424dd97537be5a9aa405e Mon Sep 17 00:00:00 2001 From: SianyiHuang Date: Mon, 30 May 2022 12:54:33 +0800 Subject: [PATCH 02/50] Config: Update Auto Brightness debounce and ambient threshold setting for p21 Bug: 234143168 Test: adb shell dumpsys display and check debounce and ambien threshold seting Change-Id: Ieaa8409ae3323f1118c08e5040b1a6dd7803daa0 --- .../base/core/res/res/values/config.xml | 153 ++++++++++-------- 1 file changed, 87 insertions(+), 66 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 3222ec0..fa97d2d 100644 --- a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml @@ -152,7 +152,7 @@ when adapting to brighter or darker environments. This parameter controls how quickly brightness changes occur in response to an observed change in light level that exceeds the hysteresis threshold. --> - 2000 + 1000 4000 @@ -169,73 +169,94 @@ 64 - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 20 - 30 - 40 - 50 - 60 - 70 - 80 - 90 - 100 - + + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 20 + 30 + 40 + 50 + 60 + 70 + 80 + 90 + 100 + 200 + 300 + 400 + 500 + 1000 + 2000 + 3000 + 4000 + - - 11373 - 5000 - 4333 - 3666 - 3000 - 2760 - 2520 - 2280 - 2040 - 1800 - 800 - 527 - 500 - 470 - 396 - 322 - 248 - 174 - 99 - 99 - + + 5186 + 4333 + 3666 + 2999 + 2759 + 2519 + 2279 + 2039 + 1799 + 799 + 527 + 499 + 470 + 517 + 565 + 612 + 660 + 708 + 742 + 636 + 582 + 549 + 369 + 294 + 269 + 220 + 220 + - - 853 - 700 - 683 - 666 - 650 - 640 - 630 - 620 - 610 - 600 - 500 - 500 - 440 - 385 - 348 - 311 - 274 - 237 - 200 - 200 - + + 525 + 683 + 666 + 650 + 640 + 630 + 620 + 610 + 600 + 500 + 500 + 440 + 385 + 382 + 379 + 376 + 373 + 371 + 367 + 387 + 397 + 403 + 380 + 345 + 333 + 283 + 283 + From 5ed43b855838d9ce0d9814c497805b3d15d305c6 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 31 May 2022 10:17:57 +0800 Subject: [PATCH 03/50] audio: update audio tuning table Change list: [waves_preset.mps] 1. Reduce some high frequency noise. 2. Increase more bass. 3. Let vocal clear. 4. Improve sound quality in Portrait mode and Landscape mode [audio_policy_volumes.xml] 1. it accompanies with waves_preset.mps to get linear volume step. 2. Improve linear volume step from min volume (1st volume) to max volume (25th volume). Bug: 234137091 Test: build pass, playback + volume Signed-off-by: vincenttew Change-Id: I36eff063bd67fc39954c3fb1b44638ba1cda58d0 --- audio/bluejay/config/audio_policy_volumes.xml | 11 ++++++++--- audio/bluejay/tuning/waves/waves_preset.mps | Bin 183298 -> 187198 bytes 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/audio/bluejay/config/audio_policy_volumes.xml b/audio/bluejay/config/audio_policy_volumes.xml index 159b62a..2fc20cb 100644 --- a/audio/bluejay/config/audio_policy_volumes.xml +++ b/audio/bluejay/config/audio_policy_volumes.xml @@ -82,9 +82,14 @@ volume index from 0 to 100. 1,-6200 28,-3800 - 72,-1650 - 80,-1400 - 92,-800 + 64,-2000 + 68,-1800 + 72,-1600 + 76,-1400 + 80,-1200 + 88,-850 + 92,-650 + 96,-400 100,0 L-MR&#K+_)zDrviDgAX8ENR8F-Z+TE-%1VNYB^IRc zu)$58#Ayj34ax&SQ^O`K;ejsLL`Wb}g4z}hAP<6KTl57C{@i=cnPIybHnaQG?j)0* zd+vVUojc#$Z_ZrU+m(IxRQBZO8&|xv^jhcSyHD0sRcvZ}XVc0z-m4qZM0%mv<_1m3 zqb-yJKc`R06r!iQ`$1pm-lSVOW$rfbK@d|^zdUZ#f2Wx+Ya8~qn^=v!+#f= zXBQms8jrH~`?^%)@+EZ$-M{m8*_-{|6VX5T;!$I?{>$iwzU9ns;gJKd0F1U0H~|;* zuU^U5p;t@3$<-Sh zpANlPaW&U)*J@K|3$ZlYnvoF8q8oZc{VBb1Pqsvd{;uB-nLbYzGVKm$uZ5v8cjs(o zxMDBNO`C}KXhRy@*5UK|$vZXJsr_O27eO7z`u2~^(73TxE1y@|2vhzgR87AkWb(Vi_?i2cW>CxZ7KqfApN}m*@QR zcrv%)Zqe!yS;oDsT47n=3nFUnhq}A_)LC8qm;5`3v5<7g=pKNTCc9L&?2}`qW-~G% z7c2ctuDS~S$gy0rt9_1jO?uD1a^uV(xcQRo6{ez(2ypzAkoO}DbW9;NmcVWF8f{!c1Lf+9PmzqEYX#r6$m@(! z%er0Ot!E=bZ03_uk|X*`4K;4TLiUE3VWoT3@tE?DIqc#g8g_{}tTjz@*usdsU_8y~ zzU8jMmqc6mem2}1V=)u<71~=O=QK@-4I%%<%VVZA(Oh%KL)h^!ja-vrbWKh>a!rOQ z*JK#FCa0BaQfR-%;=kgU5M9%rgQC=_g{FU5ACdqlwxk zqms8xbJ)aelcwA3spi^x;@Re**owg_(t3|V?@^8HhGMiEPCK$2hAF#Y7}^b|mEBNi z|7^y$8zw}%v1cK>v0m1;c0)*?rzNF7j)DOQ1{z38icv~VJCc%NN=k;Il$=&lQkaaC zOo&q2vpA8GkUr10l$O%99$f36At@=QPbW${l9FNg=|nL4bi!Cx+w#*1!(^o7%cD;x zTNWo$5({ow$jWWE?!P!Yd}IjDjw#>9)3(J`fD1-X1DvProX4AL>ndnnb%Erg80F)% zBl#Gn*{F7$+)BO`9dlAdzLNq@ieE@RicvmJJCcuK zNXqM3;gWx#Wc*j+*8^}p(5a;14Gc=emZAw% z;>?JZILA_9+`!-_R^k*}l{j}{CC*(|B~ER7W#d=kgiNFoCq(S@6RE_n2ZX$%iB{r_ zO1=^|hfS;!r|C8;&yf%9ZbLq_b5q20f_V_kn@*-fF;#Drc4RsX!|IJ-RJ~!0uYCH2 z{i7Mb5a-LI>J15FS)7;-kMEJ2H515md@k_0@O{9hLy6c`mw@RoBbpA!rs;4KO^0I3 zbhrymhr2A(p?0h$^p6(tO^1+)m<}Ogr=N)F_*_EX(L_y$QOTQ*Ijm_q<&JhuX}a?T z82=S%3yiBpT3cR|`j%8xD}IJdt*EZ7aO>qQGgHKj*7d`>{y)i#C`L2lv?DWOm@*@V zp&4;nRX`NlKeF-7hzZe*>{-Z+mc`wKBqS>7PFW>=8Q{y9NlH?TN^;tfk_=NyG7OdE zv{I77WRzq=RMMWsiIRjwB~@9Fnrkwc1HqgOE)X!L0)f(wlq3rIK9Soy1fv3h*p!l# zPDV*4qyhm6V_BRiNi0ojdna|>wPrKaY(7p(QjAJ++L4kBQ%W)nmE^QilEPRGocu2a zCPXFeS)3?INK`U)-LW!bM)_)g=y&hkRj1ezda$+wXPk3)?%6rt@B6;< z+wqOZoxc*NKkRXrEl*w2FYe0AEAYDO>M9zV=@cc=X{5vglwdh4#>4w)gWSa87ngMN z@j`*q%|>s7TX=|#*$ePg@a=a??X~nfu)b3;BJ>}alxmitO~?475R)>{FP8v-ZajuRY)g zpfJ!DmKJie_7#!#<3$K5R<%sOD4igr9V_w6lgRT3bDf1TYV#OtveOL4H_%wd>u9Dn zapP4e*V^VmC^V|WQ#la5&u46}-2sCCxz@C>jvBXok5K`cB;w)&f7#%cvf)Z6tT z*CNb@KS1$nv~!p*Yc*i}>?#xHIvuRqP7}2NHrnaR92nSKR+a#k00Bzb=WHZ^xrrJx z{YW4GNrgTG{RjPWC8Q=$)fE<9HbDk+48o4xJbuCBptKcU^;q*2iL^-7CYTQ*$!3aX zsOTB-wC@>cg6{YOh8zMmw}(2UJCC3ewv9$isz!cT5Ct(JMegB!PsU(W?tBC>4Nv|EHjw5kZj-Yn_V1hLbmx ztE2;)?S&Ec=`M^5M+@TQgyEm}mkw)v1P)9|0(Pt9WoWmp0@SBV=5p!_^4yTg*-g4- zdTgTvCE&ByCmd|Q*;}*q;5*&GX zPOryXTI$8W{lYnp-)KnTb%tBjyjXz={W=1Zda<$ox?wF$D9Q*-Az;FcFe185FRxbE OgfK-!w<%14>!M$!wdNoI From cb4808eda7a969b076d0ace98706fe881217d685 Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Wed, 8 Jun 2022 21:48:55 +0800 Subject: [PATCH 04/50] [DO NOT MERGE] Jump SVN to 4 Test: adb shell getprop ro.vendor.build.svn Bug: 235336694 Change-Id: I8f0dab592e494aeaae73df507040d05c2e86c8cb --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index f8f0d43..d70fba6 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -117,7 +117,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=4 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From bfa454bcd5a66edba35b65a5e12e88c83faba762 Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Wed, 8 Jun 2022 21:49:39 +0800 Subject: [PATCH 05/50] [DO NOT MERGE] Jump SVN to 5 Test: adb shell getprop ro.vendor.build.svn Bug: 235336488 Change-Id: Idb00e530fc18f14495d344998b7423eecd826af8 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index d70fba6..35757a9 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -117,7 +117,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=4 + ro.vendor.build.svn=5 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 94268f916367dd859f5e403bde33e9aa7c4e5ef7 Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Wed, 8 Jun 2022 21:50:30 +0800 Subject: [PATCH 06/50] Jump SVN to 6 Test: adb shell getprop ro.vendor.build.svn Bug: 235336903 Change-Id: I1616ea9f37fd8903d13bacd8859195bdd857ffc7 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 35757a9..fcf89ec 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -117,7 +117,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=6 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From d0891d133551338368a43217dd72f4165d55121b Mon Sep 17 00:00:00 2001 From: Alex Hong Date: Wed, 8 Jun 2022 22:19:55 +0800 Subject: [PATCH 07/50] Jump SVN to 7 Test: adb shell getprop ro.vendor.build.svn Bug: 235340722 Change-Id: I52a4fef86dd58d34ce4109c1cc50b730d845a809 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index fcf89ec..623422c 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -117,7 +117,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 91ea834a0c296bdbb27150c32aa126af274bc588 Mon Sep 17 00:00:00 2001 From: Grace Cheng Date: Fri, 24 Jun 2022 19:59:30 +0000 Subject: [PATCH 08/50] Specify lock icon padding value on B3 Specify lock icon padding value on B3 for visual match with C10/P10 Bug: 236442002 Test: Visual comparison of alignment using layout inspector Change-Id: I7656815cbd3301ad4771873c50e9d2d6eb53cc4e --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 992a8f6..f973c0d 100644 --- a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -46,5 +46,7 @@ 950px 1110px - + + 56px + From b05b17769ddd7e93be1b89119e2a7fe73e3eb3ba Mon Sep 17 00:00:00 2001 From: JimiChen Date: Thu, 30 Jun 2022 15:43:27 +0800 Subject: [PATCH 09/50] add CAMERA_FIXED_FPS power hint Bug: 233553311 Test: camera CTS Change-Id: Id0c2860dc51c2111231637c9a8bc727731f15d75 --- powerhint.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/powerhint.json b/powerhint.json index c28665e..6dda63d 100644 --- a/powerhint.json +++ b/powerhint.json @@ -5,6 +5,7 @@ "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq", "Values": [ "3172000", + "1352000", "1014000", "421000" ], @@ -1124,6 +1125,24 @@ "Duration": 0, "Value": "0" }, + { + "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", From 887fd850ba97029cf042e1bf024c9e1f7c8fceaf Mon Sep 17 00:00:00 2001 From: JimiChen Date: Wed, 29 Jun 2022 11:06:37 +0800 Subject: [PATCH 10/50] camera: enable fixed fps range boost Bug: 233553311 Test: cts Change-Id: Iabc53ee5d652b44f652f05949404604e633f9172 --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 02b27d5..63d5260 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -72,7 +72,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.extended_launch_boost=1 \ - persist.vendor.camera.raise_buf_allocation_priority=1 + persist.vendor.camera.raise_buf_allocation_priority=1 \ + persist.vendor.camera.fixed_fps_range_boost=1 # Display Config PRODUCT_COPY_FILES += \ From ab54152a3985a201800c7a4cb4400c820ae2a05e Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Tue, 28 Jun 2022 16:48:21 +0800 Subject: [PATCH 11/50] Set audio haptic channel amplitude limit Bug: 236709186 Test: dumpsys vibrator_manager Change-Id: Iac2f9bb89a0c5a1e5135c94c017721300b8b9180 --- bluejay/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 1 file changed, 3 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 3222ec0..bf12c90 100644 --- a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml @@ -166,6 +166,9 @@ com.google.sensor.quick_pickup + + 0.32 + 64 From 4824af05f42cdbd0e4b6f11b02a716854446c50d Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Thu, 7 Jul 2022 16:59:50 +0800 Subject: [PATCH 12/50] Disable zone dma32 As HW doesn't have 32 bit address limitation, we can disable zone dma32 to simplify memory management and improve performance. Bug: 236225957 Test: boot Signed-off-by: Martin Liu Change-Id: Ic321b460c7f63b7877fa0f12588c6f660cc0f68c --- bluejay/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 6c80b2d..8cc7e8e 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -17,6 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/bluejay/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := bluejay TARGET_SCREEN_DENSITY := 420 USES_DEVICE_GOOGLE_BLUEJAY := true +BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk From 049ef8f15ca7fbaf7e261cc405e6b3c3fd24d7a0 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Mon, 11 Jul 2022 19:59:47 +0000 Subject: [PATCH 13/50] Update SVN to 8 Bug: 232157623 Change-Id: Ie617a42723e533a686d0187b9959384934383518 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index a706046..564596a 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=7 + ro.vendor.build.svn=8 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 0509973a7de00a133970b07b1706090685d4a960 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 13 Jul 2022 23:43:04 +0000 Subject: [PATCH 14/50] Update B3 SVN to 9 Bug: 232157623 Change-Id: I3831818311cba211a3e3899ef0bd163731264055 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 564596a..4cc132e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=8 + ro.vendor.build.svn=9 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From cfaa2c57218770d755fe76687e30dae8f4c4bb2d Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Thu, 14 Jul 2022 21:13:20 +0800 Subject: [PATCH 15/50] init: set vendor.all.modules.ready and vendor.all.devices.ready migrated from init.gs101.rc Bug: 238853979 Signed-off-by: Robin Peng Change-Id: Idfc1833726592310f5c6ee2d8d30f5d6423b4a90 --- init.insmod.bluejay.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.insmod.bluejay.cfg b/init.insmod.bluejay.cfg index 1191877..7d3c2d7 100644 --- a/init.insmod.bluejay.cfg +++ b/init.insmod.bluejay.cfg @@ -16,3 +16,5 @@ modprobe|snd-soc-cs40l26.ko # All device specific modules loaded setprop|vendor.device.modules.ready +setprop|vendor.all.modules.ready +setprop|vendor.all.devices.ready From 265ba1d475a67d0e56e778fb7b6a7e6be55e8623 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 15 Jul 2022 02:54:46 +0000 Subject: [PATCH 16/50] Update B3 SVN to 10 Bug: 232157623 Change-Id: I8fe0060dd778d921f9ebc6a564400fbc137a80bc --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4cc132e..51cc968 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=9 + ro.vendor.build.svn=10 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a5e0570c484aa2128867e9c0c1cbad78b1fd547c Mon Sep 17 00:00:00 2001 From: jonerlin Date: Fri, 15 Jul 2022 10:58:57 +0800 Subject: [PATCH 17/50] B3: Add Bluetooth A/B firmware property * set A firmware BCM.hcd as default selected fimrware Bug: 229395317 Test: Manually Change-Id: I60bec44eac46c0b1c6cf171eec867ace2f2cebc5 --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index bb11f1c..c130f26 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -151,7 +151,8 @@ PRODUCT_COPY_FILES += \ # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.a2dp_aac.vbr_supported=true + persist.bluetooth.a2dp_aac.vbr_supported=true \ + persist.bluetooth.firmware.selection=BCM.hcd # Bluetooth HAL PRODUCT_PACKAGES += \ From 85107faa7501b0815b687cbf8b1e2392891cee19 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Fri, 15 Jul 2022 09:33:47 +0800 Subject: [PATCH 18/50] gps: extend min GPS week number Bug: 238931611 Validity test: 239117198 Test: Gnss Sanity test Change-Id: I3156b79dcd36b4268cee41a6e16f589b358b59c8 --- 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 a6bbcfc..0879fa9 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -76,6 +76,7 @@ EnableOnChipStopNotification="2" PowerMode="3" + MinGpsWeekNumber="2216" /> Date: Fri, 15 Jul 2022 02:58:08 +0000 Subject: [PATCH 19/50] Update B3 SVN to 11 Bug: 232157623 Change-Id: I3c4ac04b448e2aa1f14e3cc16ed5df67f7856c83 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 51cc968..3f1d795 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=10 + ro.vendor.build.svn=11 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 4706073ed19cd14d207c1b6bbb157ae31494100d Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 15 Jul 2022 03:46:54 +0000 Subject: [PATCH 20/50] Update B3 SVN to 12 Bug: 232157623 Change-Id: I137681352feaa215deb25d9d1509c0d3619c018d --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 3f1d795..086cf93 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=11 + ro.vendor.build.svn=12 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From d929361a0ab622343cfdf3bca51e1449b9cecfaa Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 19 Jul 2022 18:21:48 +0000 Subject: [PATCH 21/50] Update B3 SVN to 13 Bug: 232157623 Change-Id: Ie808c0a12ceb9f3490a989af5fce936a84e136e7 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 086cf93..5674175 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=12 + ro.vendor.build.svn=13 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a37ba4126aa2898a1f1b2f2c13dacac56833485f Mon Sep 17 00:00:00 2001 From: Beverly Date: Tue, 19 Jul 2022 19:59:26 +0000 Subject: [PATCH 22/50] Update udfps burn in vertical translation So that the mm conversion is less than 1. Also update missing config auth_ripple_alpha_in_duration which should have been migrated to be 0 since the device supports UDFPS. Test: manual Bug: 237311757 Change-Id: I83c73ce80d8550f9b605facac84e58252bdefe27 --- .../base/packages/SystemUI/res/values/dimens.xml | 7 +++++++ 1 file changed, 7 insertions(+) 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 f973c0d..c57de12 100644 --- a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -48,5 +48,12 @@ 56px + + + 0 + + + 16px From f5bc0892f73e9313269910ca55ad502688c43706 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 20 Jul 2022 12:48:04 +0800 Subject: [PATCH 23/50] init: remove twoshay HAL init trigger condition 'on late-init' Bug: 238853979 Signed-off-by: Robin Peng Change-Id: I1546537d3e4ed4323cbcdc17382ed0eb3d06cc31 --- conf/init.bluejay.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index ffd8574..d2a278d 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -3,7 +3,7 @@ import /vendor/etc/init/hw/init.gs101.rc import /vendor/etc/init/hw/init.blueport.rc # Start the twoshay touch service -on late-init && property:vendor.device.modules.ready=1 +on property:vendor.device.modules.ready=1 start twoshay # Toggle glove_mode according to touch_sensitivity_mode From 9de33e432543924e334f25ce637340c0465e103e Mon Sep 17 00:00:00 2001 From: Robert Lee Date: Thu, 21 Jul 2022 17:10:53 +0800 Subject: [PATCH 24/50] audio: enable gapless offload flag Enable gapless support on compressed_offload w/o trimming delay and padding. Bug: 236351705 Test: test with AOSP Music and MediaMonkey Change-Id: I57d4a95b71bef75245590b787c0210c5f64fb842 --- audio/bluejay/config/audio_policy_configuration.xml | 2 +- audio/bluejay/config/mixer_paths.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/audio/bluejay/config/audio_policy_configuration.xml b/audio/bluejay/config/audio_policy_configuration.xml index d07b023..40785ff 100644 --- a/audio/bluejay/config/audio_policy_configuration.xml +++ b/audio/bluejay/config/audio_policy_configuration.xml @@ -37,7 +37,7 @@ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD"> diff --git a/audio/bluejay/config/mixer_paths.xml b/audio/bluejay/config/mixer_paths.xml index 57e261b..c0991ce 100644 --- a/audio/bluejay/config/mixer_paths.xml +++ b/audio/bluejay/config/mixer_paths.xml @@ -30,6 +30,9 @@ + + + From af207a9a3dbb80c56309a80a798bf30b029a18fd Mon Sep 17 00:00:00 2001 From: jimmyshiu Date: Wed, 20 Jul 2022 17:18:18 +0000 Subject: [PATCH 25/50] Remove universal touch boost Bug: 236781877 Test: PtsUiBench Change-Id: I038c56cce9eb5ec19b5e8619af16001b0f2ec0bf Merged-In: 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 18cea8905a77e8562563aa02439698fb2170563b Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Tue, 26 Jul 2022 17:04:37 -0700 Subject: [PATCH 26/50] Change boardconfig layout to support _car builds New layout will make DPI work for _car builds bug: 240318130 Test: Local build and boot Change-Id: I3a6422dc2425a493f4cd876aa5ecb8edac1ac57b --- bluejay/BoardConfig.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 8cc7e8e..cb99800 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -13,9 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +ifdef PHONE_CAR_BOARD_PRODUCT + include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +else + TARGET_SCREEN_DENSITY := 420 +endif + TARGET_BOARD_INFO_FILE := device/google/bluejay/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := bluejay -TARGET_SCREEN_DENSITY := 420 USES_DEVICE_GOOGLE_BLUEJAY := true BOARD_KERNEL_CMDLINE += disable_dma32=on From d2f2155b629b611c17bbdbcb3ec3d30516d212ef Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 28 Jul 2022 18:19:32 +0000 Subject: [PATCH 27/50] Update bluejay SVN to 14 Bug: 238435977 Change-Id: I92f1e62b7ab689144f3a619343ae1b69cb947b00 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 5674175..7ab2b3a 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=13 + ro.vendor.build.svn=14 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From a07582c4b196b75d5ab435f822b27ea46751dc14 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 2 Aug 2022 01:16:48 +0000 Subject: [PATCH 28/50] Update bluejay SVN to 15 Bug: 238435977 Change-Id: I3b5c42ae264d27ec5466e6bff403c48e6754730d --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 7ab2b3a..34e965b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=14 + ro.vendor.build.svn=15 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 7b37c424fb8207be3db1a86a85b78f49c4718836 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Mon, 8 Aug 2022 05:25:52 +0000 Subject: [PATCH 29/50] gps: Enable SI SUPL over Wifi Test: - - SI SUPL Wifi on + mobile network off - SI SUPL Wifi on + mobile network on - SI SUPL Wifi off + mobile network on - SI SUPL Wifi on + airplane mode on Bug: 238043664 Change-Id: If09294c19bfd42da737c589be992c802e0b008de --- gps.xml.b3 | 4 +++- gps_user.xml.b3 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gps.xml.b3 b/gps.xml.b3 index a9d4598..128f98d 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -20,7 +20,9 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" - SuplUseApn="true" + SuplUseApn="false" + SuplUseApnNI="true" + SuplDummyCellInfo="true" SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index b3cdd0d..80e26be 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -19,7 +19,9 @@ SuplSslMethod="SSLv23_NO_TLSv1_2" SuplEnable="true" - SuplUseApn="true" + SuplUseApn="false" + SuplUseApnNI="true" + SuplDummyCellInfo="true" SuplUseFwCellInfo="false" SuplTlsCertDirPath="/etc/security/cacerts" SuplTlsCertPath="/vendor/etc/gnss/gps.cer" From 3ab3d62d9b848088161f5908e68490b070d53916 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 3 Aug 2022 23:08:35 -0700 Subject: [PATCH 30/50] 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 560a6f8..035c4c8 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 }, @@ -1278,7 +1277,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", From 2784ce12aa77a9de730b3c36565897de5f953edd Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 16 Aug 2022 03:29:07 +0000 Subject: [PATCH 31/50] Update bluejay SVN to 16 Bug: 242323332 Change-Id: Ibdc6b9a5e7e5891c8d3694b843acba3e8e732fcc --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 34e965b..b5d588e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=15 + ro.vendor.build.svn=16 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 1211bd84ff118d80f45fbf45ffe405bee1225fd9 Mon Sep 17 00:00:00 2001 From: pointerkung Date: Tue, 5 Jul 2022 14:03:10 +0800 Subject: [PATCH 32/50] Change util threshold of camera streaming high Fine-tune the util threshold to "1100 1078 1024" Bug: 234407965 Test: Camera CTS, ITS. 60 fps recording test. Change-Id: I57d7d63ebe44ce31ee00e347c403c33c292ee98e --- powerhint.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerhint.json b/powerhint.json index c28665e..8b7801c 100644 --- a/powerhint.json +++ b/powerhint.json @@ -124,7 +124,7 @@ "Path": "/proc/vendor_sched/util_threshold", "Values": [ "1280", - "1100" + "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true @@ -894,7 +894,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUUtilThreshold", "Duration": 0, - "Value": "1100" + "Value": "1100 1078 1024" }, { "PowerHint": "CAMERA_STREAMING_HIGH", From c5af65074f6e5d557272a1fbe4fbde298a3184e0 Mon Sep 17 00:00:00 2001 From: David Chao Date: Mon, 15 Aug 2022 19:04:05 +0800 Subject: [PATCH 33/50] thermal: seperate thermal config for charging - Separate thermal config for charger mode and remove the unused thermal throttling. Bug: 240897207 Test: usbc overheating protection and charging throttling worked properly in charger. Change-Id: Ieec7e1403456b5d878c1dfb48576ab6d5bde9908 --- device-bluejay.mk | 3 +- thermal_info_config_charge_bluejay.json | 414 ++++++++++++++++++++++++ 2 files changed, 416 insertions(+), 1 deletion(-) create mode 100644 thermal_info_config_charge_bluejay.json diff --git a/device-bluejay.mk b/device-bluejay.mk index 6e9a199..28ed77b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -60,7 +60,8 @@ PRODUCT_COPY_FILES += \ # Thermal Config PRODUCT_COPY_FILES += \ - device/google/bluejay/thermal_info_config_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json + device/google/bluejay/thermal_info_config_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ + device/google/bluejay/thermal_info_config_charge_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json # Power HAL config PRODUCT_COPY_FILES += \ diff --git a/thermal_info_config_charge_bluejay.json b/thermal_info_config_charge_bluejay.json new file mode 100644 index 0000000..2ee436f --- /dev/null +++ b/thermal_info_config_charge_bluejay.json @@ -0,0 +1,414 @@ +{ + "Sensors":[ + { + "Name":"neutral_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "32.0", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"skin_therm1", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/skin_therm1/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"skin_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/skin_therm2/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"gnss_tcxo_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "39.0", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + "0.0", + "0.9", + "0.0", + "0.0", + "0.0", + "0.0", + "0.0" + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"charger_skin_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/charger_skin_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QUIET-NEUTRAL", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "quiet_therm", + "neutral_therm" + ], + "Coefficient":[ + "0.7", + "0.3" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL-SKIN2", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "skin_therm2" + ], + "Coefficient":[ + "0.7", + "0.3" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "skin_therm1", + "disp_therm", + "skin_therm2", + "gnss_tcxo_therm" + ], + "Coefficient":[ + "0.35", + "0.2", + "0.1", + "0.15", + "0.2" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "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", + "39.0", + "41.0", + "43.0", + "45.0", + "47.0", + "55.0" + ], + "HotHysteresis":[ + 0.0, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9 + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "fcc", + "LimitInfo": [0, 4, 6, 6, 8, 8, 8], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 3, 6, 6 ,8 ,8], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + } + ] + }, + { + "Name":"USB2-MINUS-CHG", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "charger_skin_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB-THROTTLING", + "Type":"USB_PORT", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor":"usb_pwr_therm2", + "Combination":[ + "usb_pwr_therm2", + "USB2-MINUS-CHG" + ], + "Coefficient":[ + "39000", + "7000" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "2.0", + "NAN", + "NAN" + ], + "BindedCdevInfo":[ + { + "CdevRequest": "usbc-port", + "LimitInfo": [0, 0, 0, 0, 1, 1, 1] + } + ], + "VrThreshold":"NAN", + "Multiplier":1, + "PollingDelay":60000, + "PassiveDelay":7000 + } + ], + "CoolingDevices":[ + { + "Name":"fcc", + "Type":"BATTERY" + }, + { + "Name":"usbc-port", + "Type":"BATTERY" + } + ], + "PowerRails":[ + { + "Name":"VSYS_PWR_DISPLAY" + }, + { + "Name":"S2M_VDD_CPUCL2", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S3M_VDD_CPUCL1", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S4M_VDD_CPUCL0", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S2S_VDD_G3D", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S5M_VDD_INT" + }, + { + "Name":"S1M_VDD_MIF" + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "VSYS_PWR_DISPLAY", + "S2M_VDD_CPUCL2", + "S3M_VDD_CPUCL1", + "S4M_VDD_CPUCL0", + "S5M_VDD_INT", + "S1M_VDD_MIF", + "S2S_VDD_G3D" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0" + ], + "PowerSampleDelay":14000, + "PowerSampleCount":5 + } + ] +} From 86f174cee5aec54756e18ba40013d796087aab62 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 23 Aug 2022 17:48:22 +0000 Subject: [PATCH 34/50] Update bluejay SVN to 17 Bug: 242323332 Change-Id: I56d7896f25218778e8a5e2b85e858b4f2f62fd93 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b5d588e..bcbc23c 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=16 + ro.vendor.build.svn=17 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 73cd02795be0ece2eef822b4b5a60bac2e46494b Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Thu, 14 Jul 2022 21:43:56 +0000 Subject: [PATCH 35/50] Remove existing surfaceflinger uclamp boost configuration Remove existing surfaceflinger uclamp settings to not interfere with new adpf cpu hints for surfaceflinger Bug: 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 70768b1..dd8eb09 100644 --- a/powerhint.json +++ b/powerhint.json @@ -157,16 +157,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", @@ -475,12 +465,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -499,12 +483,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", From e07cbc757a39c2d31676267adc0e409f6dfbdae6 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 22 Jul 2022 06:36:58 +0000 Subject: [PATCH 36/50] Enable adpf cpu hints for SurfaceFlinger in device mk file Bug: 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 b3e6da6..e59e7df 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -232,3 +232,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 7dc600e5f73ab30dae3999279d2b628d72618f75 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 30 Aug 2022 03:15:42 +0000 Subject: [PATCH 37/50] Config dex2oat according to thermal status Config dex2oat cpuset and thread count according to thermal status. LIGHT cpuset = 0,1,2,3,4,5 thread = 6 MODERATE cpuset = 0,1,2,3 thread = 4 SEVERE cpuset = 0,1,2,3 thread = 4 CRITICAL cpuset = 0,1,2,3 thread = 2 EMERGENCY cpuset = 0,1,2,3 thread = 1 Bug: 242948832 Test: build pass Change-Id: I29c77aaa97a26254aa598e1dfbdcbaeae1aa2521 --- powerhint.json | 394 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 316 insertions(+), 78 deletions(-) diff --git a/powerhint.json b/powerhint.json index dd8eb09..21e0f21 100644 --- a/powerhint.json +++ b/powerhint.json @@ -462,6 +462,28 @@ "1" ], "DefaultIndex": 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": [ @@ -1315,6 +1337,138 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "PMU_POLL", @@ -1369,6 +1523,168 @@ "Duration": 0, "Value": "60000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1441,78 +1757,6 @@ "Duration": 1000, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", @@ -1530,12 +1774,6 @@ "Node": "RestrictedCpuset", "Duration": 0, "Value": "0-3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" } ], "AdpfConfig": [ From a94fab2d9972f071b2ef974d23312bb969b76271 Mon Sep 17 00:00:00 2001 From: juyuchen Date: Wed, 31 Aug 2022 12:36:09 +0800 Subject: [PATCH 38/50] audio: enable gapless offload for trimming data Bug: 233723867 Test: manual audio tests Signed-off-by: juyuchen Change-Id: I98e477f00c731ecebcacc5d633192e20bc55c021 --- 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 c0991ce..af4517c 100644 --- a/audio/bluejay/config/mixer_paths.xml +++ b/audio/bluejay/config/mixer_paths.xml @@ -31,7 +31,7 @@ - + From 7fb9a39f3e72a55b0b9d4e05a2af4ada3f747706 Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Thu, 1 Sep 2022 21:30:28 +0800 Subject: [PATCH 39/50] Adjust zram size to 3G According to the test result, turn zram size to 3G. Bug: 240372982 Test: boot Signed-off-by: Martin Liu Change-Id: Ibafae43d860316188b71507b6207378d9221e456 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index b3e6da6..2262bb2 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -161,7 +161,7 @@ PRODUCT_PACKAGES += \ # Set zram size PRODUCT_VENDOR_PROPERTIES += \ - vendor.zram.size=2g + vendor.zram.size=3g # Enable camera 1080P 60FPS binning mode PRODUCT_VENDOR_PROPERTIES += \ From 08dcbe98895afef7afd294939533c99368fc5bfd Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 18 Aug 2022 03:01:37 +0000 Subject: [PATCH 40/50] Remove RestrictedCpuset hint With systemui now changed its cpuset in early stage, we no longer need RestrictedCpuset hint as workaround. Bug: 242775562 Test: build pass Change-Id: I44477860126809487bb960eb1a0b037734357975 --- powerhint.json | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/powerhint.json b/powerhint.json index 21e0f21..f1794a0 100644 --- a/powerhint.json +++ b/powerhint.json @@ -203,15 +203,6 @@ ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -1762,18 +1753,6 @@ "Node": "MLUclampBoost", "Duration": 2000, "Value": "512" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ From 68db06671256e7c31a895b5944367dc1ce01c0cc Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 9 Sep 2022 19:19:51 +0000 Subject: [PATCH 41/50] Update bluejay SVN to 18 Bug: 244460991 Change-Id: Ia13d9039e409fe1d66ef8d167c90e12e69f9323d --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index bcbc23c..2f9e699 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -120,7 +120,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=17 + ro.vendor.build.svn=18 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From bd97cfde6bea74f5314e10ba294e2008db72775a Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Tue, 13 Sep 2022 17:13:34 +0800 Subject: [PATCH 42/50] gps: enable GNSS PPS feature Bug: 244398743 Test: extensive tests with PPS enabled in b/235270127 Change-Id: Idce3155ad73537a15023864ed57758c3fb1484c7 --- gps.xml.b3 | 2 ++ gps_user.xml.b3 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/gps.xml.b3 b/gps.xml.b3 index 128f98d..99e3b58 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -59,9 +59,11 @@ CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" + PpsDevice="/sys/class/pps/pps0/assert_elapsed" /> Date: Thu, 15 Sep 2022 22:13:20 +0800 Subject: [PATCH 43/50] Remove frequency boost of big cores for FACE_UNLOCK Bug: 245619770 Test: build Change-Id: I1ee5d3ad670de959eb1321926d1d739d6e12207d --- powerhint.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/powerhint.json b/powerhint.json index f1794a0..97081c6 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1676,18 +1676,6 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", From 34998e3264b7fda5c09b8a831ff07a211067fe2f Mon Sep 17 00:00:00 2001 From: Chase Wu Date: Mon, 12 Sep 2022 20:34:33 +0800 Subject: [PATCH 44/50] 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 Merged-In: I1b363136147beff334fba0ca1e065729dcfb57e4 --- device-bluejay.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 2ef5611..bc7d573 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 027014dc8c4f1da8cec85edd012317ff090d2d51 Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Fri, 16 Sep 2022 07:47:20 +0000 Subject: [PATCH 45/50] powerhint: clean up unused hints in B3 INTERACTION is removed but some actions still use it. Bug: 246738037 Test: pts-tradefed run commandAndExit pts -m PtsPerformanceTestCases -t com.google.android.perf.pts.PowerHintJsonVerifyTest Change-Id: Iaecddf37361eeda9697dd6324a4de9cc33511f5c --- powerhint.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/powerhint.json b/powerhint.json index f1794a0..bb0ae06 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1288,11 +1288,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", From d9df6ed1b5dc52e05ec912415b526cef75233b67 Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 20 Sep 2022 07:23:23 +0000 Subject: [PATCH 46/50] audio: extand the period number of hifi usecase extend this to prevent alsa trigger stop playback and causing pop Bug: 238056484 Signed-off-by: vincenttew Change-Id: I1c4bf46a51893717b8d184a0919073eafcdc1e50 --- audio/bluejay/config/audio_platform_configuration.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/bluejay/config/audio_platform_configuration.xml b/audio/bluejay/config/audio_platform_configuration.xml index 2b72e61..f510d08 100644 --- a/audio/bluejay/config/audio_platform_configuration.xml +++ b/audio/bluejay/config/audio_platform_configuration.xml @@ -198,8 +198,8 @@ - - + + From 0b27db35f289f41c05f0994a90999fcdfdb29365 Mon Sep 17 00:00:00 2001 From: Taeju Park Date: Wed, 21 Sep 2022 18:26:14 -0700 Subject: [PATCH 47/50] Add Ownership to powerhint files Bug: 248115959 Signed-off-by: Taeju Park Change-Id: Id6ad6d8d4b49e4c82bb43d2358f93c65ba957701 --- OWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 0000000..1451bd8 --- /dev/null +++ b/OWNERS @@ -0,0 +1 @@ +per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com From 1d3082b5f44aab6185d9b051ebbec38f05f3ac44 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 48/50] Set Lyric camera_hardware variable. Bug: 240478511 Test: presubmit Change-Id: I11ad27a5ef5c1b5e0aa39c73c45ce6de7e429282 Merged-In: I11ad27a5ef5c1b5e0aa39c73c45ce6de7e429282 --- device-bluejay.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 87e5f1b..ddf86c6 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 cae3b298e601eb4f135f59600e7a416f2ec8a11c Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Mon, 3 Oct 2022 19:31:52 +0000 Subject: [PATCH 49/50] Update bluejay SVN to 19 Bug: 250644806 Change-Id: Iee0902caddc1f8bbcba8f588819d0404a8a3b902 (cherry picked from commit 991c800e43ad682b399207009909148c647f236b) Merged-In: Iee0902caddc1f8bbcba8f588819d0404a8a3b902 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index ddf86c6..ac8110f 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=18 + ro.vendor.build.svn=19 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 990009ffa64cbd64a76634c570427c5df9921490 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Thu, 10 Nov 2022 19:36:09 +0000 Subject: [PATCH 50/50] Update bluejay SVN to 20 Bug: 250644806 Change-Id: I47165cbc0d8925d2b529fa3a3d94a9920e8c416a (cherry picked from commit 99e9f82364c3d06cdd3481bc9be68829935bb780) Merged-In: I47165cbc0d8925d2b529fa3a3d94a9920e8c416a --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index ac8110f..d4ecd30 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=19 + ro.vendor.build.svn=20 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \