From 4a259ac6bb4bd59fd82a27de39642caef677be06 Mon Sep 17 00:00:00 2001 From: Dmitry Skiba Date: Thu, 18 Jul 2024 23:26:39 +0000 Subject: [PATCH 1/7] Reduce swap_free_low_percentage for Tokay. The default for swap_free_low_percentage is 10, and this CL reduces it to 7 to compenstate for AiCore carveout (4GB on 12GB device). Test: flash and check ro.lmk.swap_free_low_percentage property Flag: NONE overriding system property Bug: 353531482 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b917ad256b09fb44a75f6aef269adb1e265c3f2b) Merged-In: I57e320010758be3b2ae6b3cd89c384394147f62a Change-Id: I57e320010758be3b2ae6b3cd89c384394147f62a --- device-tokay.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-tokay.mk b/device-tokay.mk index ca3e3d44..1b91969b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -406,3 +406,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.thread_dispatcher.enabled=true + +# Reduce lmkd aggressiveness +PRODUCT_PROPERTY_OVERRIDES += \ + ro.lmk.swap_free_low_percentage=7 From aa2bff5fae044d2a363bd53120b6d5e3e14ce8ea Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 3 Jul 2024 02:07:48 +0000 Subject: [PATCH 2/7] Update SVN to 2 Bug: 350826665 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7c8f65bf43c690f47cf4898daf346531738eb121) Merged-In: I2fb755d247f2efffa2f1c84322b52d33367d5cdb Change-Id: I2fb755d247f2efffa2f1c84322b52d33367d5cdb --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-tokay.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 56b02b80..07cfd08a 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index 0084c88b..a4aa3474 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index 1b91969b..0701813b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -60,7 +60,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=1 + ro.vendor.build.svn=2 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay) From faa3892f1c25b830dd1f8fff48af887cd718adac Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 5 Jul 2024 01:02:54 +0000 Subject: [PATCH 3/7] Update SVN to 3 Bug: 350826665 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6a966e0aee1d1ea751bf76f6087cd09e41ead8b) Merged-In: I89a9733fdacfc6eef3f6bcb19cc4c0cb1bcc186c Change-Id: I89a9733fdacfc6eef3f6bcb19cc4c0cb1bcc186c --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-tokay.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 07cfd08a..0bf7d900 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=2 + ro.vendor.build.svn=3 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index a4aa3474..02fea019 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -70,7 +70,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=2 + ro.vendor.build.svn=3 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index 0701813b..fed02005 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -60,7 +60,7 @@ include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=2 + ro.vendor.build.svn=3 # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay) From 8fc2025fe9d408901c7c046a5a2918d3b492d64f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 10 Jul 2024 21:25:47 +0000 Subject: [PATCH 4/7] caimito: Use build_flags for SVN Flag: build.RELEASE_SVN_CAIMAN Flag: build.RELEASE_SVN_KOMODO Flag: build.RELEASE_SVN_TOKAY Bug: 332726030 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dc64ebbb620e27b5efda7f7814c3f795efaec58b) Merged-In: I8e2a835fd2887c4e77d95bf0a3bc63a25161b080 Change-Id: I8e2a835fd2887c4e77d95bf0a3bc63a25161b080 --- device-caiman.mk | 9 ++++++++- device-komodo.mk | 9 ++++++++- device-tokay.mk | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 0bf7d900..90a7150b 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases +ifdef RELEASE_SVN_CAIMAN +TARGET_SVN ?= $(RELEASE_SVN_CAIMAN) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 03 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=$(TARGET_SVN) # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,caiman) diff --git a/device-komodo.mk b/device-komodo.mk index 02fea019..deae0497 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases +ifdef RELEASE_SVN_KOMODO +TARGET_SVN ?= $(RELEASE_SVN_KOMODO) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 03 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=$(TARGET_SVN) # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,komodo) diff --git a/device-tokay.mk b/device-tokay.mk index fed02005..2df48d0b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -59,8 +59,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk # Increment the SVN for any official public releases +ifdef RELEASE_SVN_TOKAY +TARGET_SVN ?= $(RELEASE_SVN_TOKAY) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 03 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=3 + ro.vendor.build.svn=$(TARGET_SVN) # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,tokay) From 67bb9c0854b4068f6d2f6d66c1c4f3bfb2df0988 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Mon, 22 Jul 2024 03:46:43 +0000 Subject: [PATCH 5/7] Update P24 SVN to 4 Bug: 350826665 Flag: build.RELEASE_SVN_CAIMAN Flag: build.RELEASE_SVN_KOMODO Flag: build.RELEASE_SVN_TOKAY (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1a61f943a766179084e4e483ec876a60421d84f1) Merged-In: I5de5e88e286aea0a5d5786e7f84732f947a88449 Change-Id: I5de5e88e286aea0a5d5786e7f84732f947a88449 --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-tokay.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 90a7150b..4b833252 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -73,7 +73,7 @@ ifdef RELEASE_SVN_CAIMAN TARGET_SVN ?= $(RELEASE_SVN_CAIMAN) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 03 +TARGET_SVN ?= 04 endif PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-komodo.mk b/device-komodo.mk index deae0497..30d54d61 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -73,7 +73,7 @@ ifdef RELEASE_SVN_KOMODO TARGET_SVN ?= $(RELEASE_SVN_KOMODO) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 03 +TARGET_SVN ?= 04 endif PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-tokay.mk b/device-tokay.mk index 2df48d0b..c65bc593 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -63,7 +63,7 @@ ifdef RELEASE_SVN_TOKAY TARGET_SVN ?= $(RELEASE_SVN_TOKAY) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 03 +TARGET_SVN ?= 04 endif PRODUCT_VENDOR_PROPERTIES += \ From 4af6b8612462d05b840bd58d39f995f7a0b58a45 Mon Sep 17 00:00:00 2001 From: Shreshta Manu Date: Wed, 14 Aug 2024 18:34:46 +0000 Subject: [PATCH 6/7] [uwb] enable multicast update rsp v2 Test: atest CtsUwbTestCases Bug: 359665219 Flag: EXEMPT overlay update Change-Id: I5a502f67a2b991114b050d5c1567c913e309bf63 --- caiman/rro_overlays/UwbOverlay/res/values/config.xml | 4 ++++ device-caiman.mk | 4 ++++ device-komodo.mk | 4 ++++ komodo/rro_overlays/UwbOverlay/res/values/config.xml | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/caiman/rro_overlays/UwbOverlay/res/values/config.xml b/caiman/rro_overlays/UwbOverlay/res/values/config.xml index 315f18f2..2e9b3222 100644 --- a/caiman/rro_overlays/UwbOverlay/res/values/config.xml +++ b/caiman/rro_overlays/UwbOverlay/res/values/config.xml @@ -34,4 +34,8 @@ true + + + true diff --git a/device-caiman.mk b/device-caiman.mk index 46d95470..9def00d9 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -288,6 +288,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += \ device/google/caimito/powerstats/caiman +# UWB Overlay +PRODUCT_PACKAGES += \ + UwbOverlayCM4 + # WiFi Overlay PRODUCT_PACKAGES += \ WifiOverlay2024 diff --git a/device-komodo.mk b/device-komodo.mk index 1b0268b8..4496f6e0 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -308,6 +308,10 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += \ device/google/caimito/powerstats/komodo +# UWB Overlay +PRODUCT_PACKAGES += \ + UwbOverlayKM4 + # WiFi Overlay PRODUCT_PACKAGES += \ WifiOverlay2024 diff --git a/komodo/rro_overlays/UwbOverlay/res/values/config.xml b/komodo/rro_overlays/UwbOverlay/res/values/config.xml index de6d8c3c..be74e3ed 100644 --- a/komodo/rro_overlays/UwbOverlay/res/values/config.xml +++ b/komodo/rro_overlays/UwbOverlay/res/values/config.xml @@ -34,4 +34,8 @@ true + + + true From f2def037fb6c2d1471c6011cfce44f00d3c734b4 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 14 Aug 2024 08:28:03 +0000 Subject: [PATCH 7/7] thermal:remove unused state2power value Bug: 355566259 Test: Build test Flag: EXEMPT NDK Change-Id: I58abd056ea1edfa9478d4419ca84560951c2a280 Signed-off-by: Peter (YM) --- thermal/thermal_info_config_ripcurrent24.json | 9 +++------ thermal/thermal_info_config_ripcurrentpro.json | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/thermal/thermal_info_config_ripcurrent24.json b/thermal/thermal_info_config_ripcurrent24.json index e8ba936c..f081771b 100644 --- a/thermal/thermal_info_config_ripcurrent24.json +++ b/thermal/thermal_info_config_ripcurrent24.json @@ -508,20 +508,17 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", diff --git a/thermal/thermal_info_config_ripcurrentpro.json b/thermal/thermal_info_config_ripcurrentpro.json index a40bd596..6d05ad76 100644 --- a/thermal/thermal_info_config_ripcurrentpro.json +++ b/thermal/thermal_info_config_ripcurrentpro.json @@ -80,20 +80,17 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["1100", "1050", "1000", "950", "900", "850", "800", "750", "700", "650", "600"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["1450", "1400", "1350", "1300", "1250", "1200", "1150", "1100", "1050", "1000", "950", "900", "850", "800", "750"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0",