From fa7a219cb4a5147363ad3a4f5e397bd7919e9820 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:13:58 +0000 Subject: [PATCH 01/12] Update bluejay SVN to 50 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9b309d763af958632045184fe493b6ed1d1510c2) Merged-In: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6 Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 29c86fa..545272b 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=49 + ro.vendor.build.svn=50 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From be5320326187f5c905d71e32a42dea040ea40a98 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:32 +0000 Subject: [PATCH 02/12] Update bluejay SVN to 51 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d81b0b63f1806dbd9353d266dc0bab6a3e0549fd) Merged-In: If8f16626a5e13f98e81ff0833a60888efe9cddcd Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 545272b..fac3875 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=50 + ro.vendor.build.svn=51 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From ad5bdd72ff245dc5f5ae0a2a8068ebdd07ce21e5 Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 20:21:31 +0000 Subject: [PATCH 03/12] Adding Fast Pair extended IDs for Pixel 6a Adding the Fast Pair extended IDs for bluejay so that Quick Start shows the right Fast Pair bottom sheet on other devices during setup. Bug: 305516133 Test: TBD (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:648307e16fe999eec1c83ab2df5bfa6364076216) Merged-In: I852842706664902dc3a76175810ebf869439796d Change-Id: I852842706664902dc3a76175810ebf869439796d --- device-bluejay.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index fac3875..8a244e3 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -250,3 +250,8 @@ PRODUCT_PACKAGES += ufs_firmware_update.sh # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=bluejay From 3a56f8bf7a8942dd0fa1acd69286da24793b1e69 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:11:04 +0000 Subject: [PATCH 04/12] Update bluejay SVN to 52 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8f9b6dbaaa8e78c8ded400d19d2f7d89fdaf2fd8) Merged-In: I403e87cf5943f5c45d6d0db99a3e15018064067a Change-Id: I403e87cf5943f5c45d6d0db99a3e15018064067a --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 8a244e3..a95e7b8 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=51 + ro.vendor.build.svn=52 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From e9b8123612601ac51c1c2bc5a132fc96b034fedf Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 11 Sep 2023 20:39:10 -0700 Subject: [PATCH 05/12] powerhint: add game mode tuning nodes Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes. Test: build Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:33cd1ee8f025122df92662aceef76d55677f02a6) Merged-In: I6b200ac6d41e06f445a97583fc189ace924f1fa6 Change-Id: I6b200ac6d41e06f445a97583fc189ace924f1fa6 --- powerhint.json | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/powerhint.json b/powerhint.json index eb913e8..f658d76 100644 --- a/powerhint.json +++ b/powerhint.json @@ -46,6 +46,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPULittleClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "5000", + "500" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUMidClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq", @@ -73,6 +83,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUMidClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "CPUBigClusterMaxFreq", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/scaling_max_freq", @@ -100,6 +120,16 @@ ], "ResetOnInit": true }, + { + "Name": "CPUBigClusterDownRateLimitUs", + "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us", + "Values": [ + "20000", + "3000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "GPUMinFreq", "Path": "/sys/devices/platform/1c500000.mali/hint_min_freq", @@ -135,11 +165,22 @@ "Path": "/proc/vendor_sched/dvfs_headroom", "Values": [ "1280", + "1100", "1100 1078 1024" ], "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUTaperedDVFSHeadroomEnable", + "Path": "/proc/vendor_sched/tapered_dvfs_headroom_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", From 1285e6a938c57cc22ca92484b411f7b85ba5f948 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 11 Sep 2023 20:41:59 -0700 Subject: [PATCH 06/12] powerhint: game mode tuning Test: test build Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:df0dd037f41de6fc46c2d51f544426f993480469) Merged-In: I3fd4cff4da5815e7018b69ff08aada79cc1f6e7d Change-Id: I3fd4cff4da5815e7018b69ff08aada79cc1f6e7d --- powerhint.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/powerhint.json b/powerhint.json index f658d76..6dc9ebc 100644 --- a/powerhint.json +++ b/powerhint.json @@ -588,6 +588,36 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "LAUNCH", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1578,6 +1608,36 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "GAME", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, + { + "PowerHint": "GAME", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "GAME", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 0, + "Value": "500" + }, + { + "PowerHint": "GAME", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, + { + "PowerHint": "GAME", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 0, + "Value": "3000" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", From 97ca2e0e167579aa847957dd6c044eceff6a0a17 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:19:56 +0000 Subject: [PATCH 07/12] Update bluejay SVN to 54 Bug: 313696499 Change-Id: Iadb6f6d58659b63bb1d3d1fad6c6c839f899814c --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 4cb4b43..ccdf081 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -123,7 +123,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=53 + ro.vendor.build.svn=54 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ From 35de536662907b57cb115afb3446096fb15e0d8b Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 08/12] Revert^2 "bluejay: Replace NFC app with NFC apex" 75bff8a95f3e1fbeeaffce4d2fe720152761edbd Bug: 303286040 Test: Compiles Change-Id: Ibc741f24cc6d19adda3097d17bc81baf455f71d3 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 5c72c86..4788b4c 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -109,7 +109,7 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From 13426a9d37641687908d97c969a2c547eb5f19cd Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 09/12] Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex" 041ffd8ea61c819aa02f73440b890101038ab694 Bug: 303286040 Test: Compiles Change-Id: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb --- bluejay/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ bluejay/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ device-bluejay.mk | 3 +- 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 bluejay/rro_overlays/NfcOverlay/Android.bp create mode 100644 bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 bluejay/rro_overlays/NfcOverlay/OWNERS create mode 100644 bluejay/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/bluejay/rro_overlays/NfcOverlay/Android.bp b/bluejay/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..c38f6c9 --- /dev/null +++ b/bluejay/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_bluejay_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayBluejay", + sdk_version: "current", + product_specific: true +} diff --git a/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml b/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/bluejay/rro_overlays/NfcOverlay/OWNERS b/bluejay/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/bluejay/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/bluejay/rro_overlays/NfcOverlay/res/values/config.xml b/bluejay/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..5610991 --- /dev/null +++ b/bluejay/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + + GB62Z + G1AZG + GX7AS + GB17L + + true + + 70 + 150 + false + + 36 + + + 83 + + diff --git a/device-bluejay.mk b/device-bluejay.mk index 4788b4c..fbc90c0 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -111,7 +111,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayBluejay # SecureElement PRODUCT_PACKAGES += \ From f9d6933a7c9b9398382c2a9d1d5f48989e256f78 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Wed, 6 Dec 2023 21:30:51 +0000 Subject: [PATCH 10/12] Revert^2 "bluejay: Replace NFC app with NFC apex" 75bff8a95f3e1fbeeaffce4d2fe720152761edbd Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:35de536662907b57cb115afb3446096fb15e0d8b) Merged-In: Ibc741f24cc6d19adda3097d17bc81baf455f71d3 Change-Id: Ibc741f24cc6d19adda3097d17bc81baf455f71d3 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index dd53985..13fdd7f 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -100,7 +100,7 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st From 8f013ac1a6b8def23d3a911863eee386b072b54e Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH 11/12] Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex" 041ffd8ea61c819aa02f73440b890101038ab694 Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:13426a9d37641687908d97c969a2c547eb5f19cd) Merged-In: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb Change-Id: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb Change-Id: Ic52d8977c950aec66a6206736fa0ded4adacb1c2 --- bluejay/rro_overlays/NfcOverlay/Android.bp | 9 +++++ .../NfcOverlay/AndroidManifest.xml | 27 ++++++++++++++ bluejay/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../NfcOverlay/res/values/config.xml | 35 +++++++++++++++++++ device-bluejay.mk | 3 +- 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 bluejay/rro_overlays/NfcOverlay/Android.bp create mode 100644 bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml create mode 100644 bluejay/rro_overlays/NfcOverlay/OWNERS create mode 100644 bluejay/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/bluejay/rro_overlays/NfcOverlay/Android.bp b/bluejay/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..c38f6c9 --- /dev/null +++ b/bluejay/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_bluejay_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayBluejay", + sdk_version: "current", + product_specific: true +} diff --git a/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml b/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/bluejay/rro_overlays/NfcOverlay/OWNERS b/bluejay/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/bluejay/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/bluejay/rro_overlays/NfcOverlay/res/values/config.xml b/bluejay/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..5610991 --- /dev/null +++ b/bluejay/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + + GB62Z + G1AZG + GX7AS + GB17L + + true + + 70 + 150 + false + + 36 + + + 83 + + diff --git a/device-bluejay.mk b/device-bluejay.mk index dd53985..de24c92 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -102,7 +102,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayBluejay # SecureElement PRODUCT_PACKAGES += \ From e765ab049dff6dcda28e57e9caf6fc8058f8d591 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 14:09:47 +0800 Subject: [PATCH 12/12] Branch bootloader prebuilts for 24Q2 release Bug: 313350495 Change-Id: I72349a14a2fa1766ca6c2de28b2ec376ab59f99a --- bluejay/BoardConfig.mk | 2 ++ device-bluejay.mk | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 09f98be..714c9c3 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -23,6 +23,8 @@ endif RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 else RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk endif diff --git a/device-bluejay.mk b/device-bluejay.mk index fbc90c0..da89a1e 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -42,6 +42,8 @@ include device/google/gs-common/touch/stm/stm11.mk GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/trunk endif @@ -144,6 +146,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q2 else PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk endif