From 72122a572e7377c69a9e469344c391493ebfed20 Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 17 Feb 2023 15:33:33 -0800 Subject: dck: add SE capability property Bug: 229777047 Test: boot cheetah; check logs to see that SE property is used Change-Id: I413b80530f585317ec272383c9027c7725c8ea77 Signed-off-by: Jeffrey Carlyle --- device-bluejay.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 6f5a349..87001d2 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -127,7 +127,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=2 + ro.gms.dck.eligible_wcc=2 \ + ro.gms.dck.se_capability=1 # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts -- cgit v1.2.3 From 306157f1a5d66bdfec247e3ca054cf6e84d5c8eb Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 14 Apr 2023 11:01:58 -0700 Subject: Speed up bluejay builds by excluding code that can never be used. Uses the new PRODUCT_SOURCE_ROOT_DIRS flag, and the file list for pixel in vendor/google/products/sources_pixel.mk Test: treehugger, abtd for the relevant buidls Change-Id: I0f91a3743f29c1a9ca525f19d38b1394da667692 --- device-bluejay.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 6bd73da..ea9cbb7 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -14,6 +14,9 @@ # limitations under the License. # +# Restrict the visibility of Android.bp files to improve build analysis time +$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) + TARGET_KERNEL_DIR ?= device/google/bluejay-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/bluejay-kernel/kernel-headers -- cgit v1.2.3 From be852e42090e1a0059fd500c7245509fa3e29e8b Mon Sep 17 00:00:00 2001 From: chenkris Date: Thu, 8 Jun 2023 09:55:26 +0000 Subject: Move goodix mk files from device/google/gs101 to vendor/goodix/udfps Bug: 270657514 Test: build Change-Id: Ia4302afcde138aae4de4e41ee28e98a9b784e256 --- device-bluejay.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index 0065197..e386161 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -27,23 +27,24 @@ $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/devi $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/bluejay/device-vendor-bluejay.mk) $(call inherit-product-if-exists, vendor/google_devices/bluejay/proprietary/WallpapersBluejay.mk) -GOODIX_CONFIG_BUILD_VERSION := g7_trusty DEVICE_PACKAGE_OVERLAYS += device/google/bluejay/bluejay/overlay include device/google/gs101/fingerprint/extension/fingerprint.extension.mk include device/google/bluejay-sepolicy/bluejay-sepolicy.mk include device/google/bluejay/audio/bluejay/audio-tables.mk include device/google/gs101/device-shipping-common.mk -include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -ifeq ($(filter factory_bluejay, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +# Fingerprint HAL +GOODIX_CONFIG_BUILD_VERSION := g7_trusty +include vendor/goodix/udfps/configuration/udfps_common.mk +ifeq ($(filter factory%, $(TARGET_PRODUCT)),) +include vendor/goodix/udfps/configuration/udfps_shipping.mk else -include device/google/gs101/fingerprint/udfps_factory.mk +include vendor/goodix/udfps/configuration/udfps_factory.mk endif # go/lyric-soong-variables -- cgit v1.2.3 From 90d51b56277e002fdf21bcfdb8740dc4c68afb5d Mon Sep 17 00:00:00 2001 From: chenkris Date: Tue, 13 Jun 2023 03:11:24 +0000 Subject: udfps: fix BB on git_master-without-vendor Bug: 286774587 Test: Build Change-Id: I64bf3a50215f73abebbcc9fddff6233b414c7104 --- device-bluejay.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index e386161..0c141de 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -40,11 +40,11 @@ include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include vendor/goodix/udfps/configuration/udfps_common.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include vendor/goodix/udfps/configuration/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include vendor/goodix/udfps/configuration/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # go/lyric-soong-variables -- cgit v1.2.3 From c04fbc3bd079ce114b73418b6e72914720048f56 Mon Sep 17 00:00:00 2001 From: Jacky Liu Date: Mon, 10 Jul 2023 22:24:11 +0800 Subject: bluejay: update bluetooth_power_limits.csv paths LOCAL_PATH should not be used without explicitly assignment. Bug: 289490177 Test: build Change-Id: I9d9ab909be4a048f99f1276331e675270eb634a4 --- device-bluejay.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index e5d3c6d..e13bbb3 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -151,13 +151,13 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach # Bluetooth Tx power caps for bluejay PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GB17L_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GX7AS_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GB62Z_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB62Z_US.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GX7AS_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GX7AS_US.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_G1AZG_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G1AZG_EU.csv \ - $(LOCAL_PATH)/bluetooth_power_limits_GB62Z_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB62Z_EU.csv + device/google/bluejay/bluetooth_power_limits.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/bluejay/bluetooth_power_limits_GB17L_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ + device/google/bluejay/bluetooth_power_limits_GX7AS_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_CA.csv \ + device/google/bluejay/bluetooth_power_limits_GB62Z_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB62Z_US.csv \ + device/google/bluejay/bluetooth_power_limits_GX7AS_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GX7AS_US.csv \ + device/google/bluejay/bluetooth_power_limits_G1AZG_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G1AZG_EU.csv \ + device/google/bluejay/bluetooth_power_limits_GB62Z_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB62Z_EU.csv # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ -- cgit v1.2.3 From b0730273ad7c3fed4de7fca41aac125e26098dfe Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Sat, 23 Sep 2023 12:24:18 +0800 Subject: powerhint: Add DISPLAY_CHANGE hint Add DISPLAY_CHANGE hint for display layout change due to rotation or switching between inner and outer panels. Bug: 298150450 Test: build pass Change-Id: I397334d53c89b65af54e91455b76f0036754738e --- powerhint.json | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/powerhint.json b/powerhint.json index 9942292..0b850f1 100644 --- a/powerhint.json +++ b/powerhint.json @@ -642,6 +642,66 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "692" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "202" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "3172000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "GPUPowerPolicy", + "Duration": 5000, + "Value": "always_on" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "NPITaskPacking", + "Duration": 5000, + "Value": "0" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "MemFreq", -- cgit v1.2.3 From 5325728bfcfcc70bc8dc4120eed26dd4cfb866c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 28 Sep 2023 00:29:19 +0000 Subject: OWNERS: master -> main Change-Id: I27239c7c754c1c58b72e4c24e782119364617f42 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 79003ba..7eed0c3 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS -- cgit v1.2.3 From 9b309d763af958632045184fe493b6ed1d1510c2 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:13:58 +0000 Subject: Update bluejay SVN to 50 Bug: 302612466 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 += \ -- cgit v1.2.3 From be1d0f6c3801c66323198f73cb3197f69e401bc2 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:32 +0000 Subject: Update bluejay SVN to 51 Bug: 302612466 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 += \ -- cgit v1.2.3 From fbf46c398ab23e1c22cba933b896d0e1e85a86b7 Mon Sep 17 00:00:00 2001 From: ClintChen Date: Wed, 4 Oct 2023 09:25:24 +0000 Subject: b3: Enable build flag versioning for radio and bootloader Bug: 301142125 Change-Id: I665ab708541ca3b6d027daa3cf66ed66d211242b --- bluejay/BoardConfig.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index ae13ab0..0cea971 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -20,6 +20,9 @@ else TARGET_SCREEN_DENSITY := 420 endif +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_BLUEJAY_BOOTLOADER_DIR) + # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true -- cgit v1.2.3 From 168fe64455c31d51fd8dc16866dd3b2d48fe5600 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Mon, 9 Oct 2023 19:56:02 +0000 Subject: bluejay: Replace NFC app with NFC apex Bug: 303286040 Test: Compiles (cherry picked from https://android-review.googlesource.com/q/commit:f09150e453cbc609d1d45a72fabb3eb8bff6bba1) Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1 Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index ad30f01..f1560b2 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -104,7 +104,7 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + com.android.nfcservices \ Tag \ android.hardware.nfc-service.st -- cgit v1.2.3 From 5f5a34609b00a5638f46147a0736ab5066fb9267 Mon Sep 17 00:00:00 2001 From: guibing Date: Wed, 2 Aug 2023 17:20:45 +0000 Subject: powerhint: bluejay: update vendor_sched procfs paths Vendor sched procfs path hierarchy gets updated in kernel. Update the paths in powerhint json file to match the change. Bug: 289151587 Test: Uibench ab test Change-Id: I08b099b8267a8744ec50175d3284fb48a404c285 --- powerhint.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/powerhint.json b/powerhint.json index 3215500..eb913e8 100644 --- a/powerhint.json +++ b/powerhint.json @@ -151,7 +151,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "692", "1" @@ -160,7 +160,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "202", "0" @@ -169,7 +169,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "640" @@ -188,7 +188,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "0", "1" @@ -237,7 +237,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -246,7 +246,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "0", "1" @@ -255,7 +255,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -265,7 +265,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -501,7 +501,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" -- cgit v1.2.3 From 648307e16fe999eec1c83ab2df5bfa6364076216 Mon Sep 17 00:00:00 2001 From: Shivakumar Neginal Date: Mon, 16 Oct 2023 20:21:31 +0000 Subject: 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 Change-Id: I852842706664902dc3a76175810ebf869439796d --- device-bluejay.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device-bluejay.mk b/device-bluejay.mk index 545272b..1a6727d 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 -- cgit v1.2.3 From bfec851399a5377709e75f1c1069676bdcb01270 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 20 Oct 2023 11:48:30 -0700 Subject: thermal: align the setting VSKIN related sensors Bug: 302435949 Test: emul_temp Change-Id: Ib8ca404fe575ade08146e612354f8f06734eab72 --- thermal_info_config_bluejay.json | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json index 6d90a20..a8a1166 100644 --- a/thermal_info_config_bluejay.json +++ b/thermal_info_config_bluejay.json @@ -261,8 +261,8 @@ "VirtualSensor":true, "TriggerSensor":"neutral_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"], - "Coefficient":["1.0", "1.0", "1.0"], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":["1.0"], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -277,8 +277,8 @@ "VirtualSensor":true, "TriggerSensor":"neutral_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"], - "Coefficient":["1.0", "1.0", "1.0"], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":["1.0"], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -333,8 +333,8 @@ "VirtualSensor":true, "TriggerSensor":"neutral_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"], - "Coefficient":["1.0", "1.0", "1.0"], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":["1.0"], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -397,16 +397,8 @@ "VirtualSensor":true, "TriggerSensor":"neutral_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-SKIN2", - "VIRTUAL-NEUTRAL", - "VIRTUAL-QUIET-NEUTRAL" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0" - ], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":["1.0"], "HotThreshold":[ "NAN", "39.0", @@ -447,16 +439,8 @@ "VirtualSensor":true, "TriggerSensor":"neutral_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-SKIN2", - "VIRTUAL-NEUTRAL", - "VIRTUAL-QUIET-NEUTRAL" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0" - ], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":["1.0"], "HotThreshold":[ "NAN", "NAN", @@ -1210,4 +1194,4 @@ } } } -} \ No newline at end of file +} -- cgit v1.2.3 From d92f98af415c5f814e8c33020c614515b541da52 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:13:58 +0000 Subject: Update bluejay SVN to 50 Bug: 302612466 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 f32e8f9..771a210 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 += \ -- cgit v1.2.3 From d81b0b63f1806dbd9353d266dc0bab6a3e0549fd Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 29 Sep 2023 01:15:32 +0000 Subject: Update bluejay SVN to 51 Bug: 302612466 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 771a210..3cbd0f2 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 += \ -- cgit v1.2.3 From c0159563f3835c858d6587bebcbd87d123113530 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 25 Oct 2023 15:37:23 -0600 Subject: Fix lunch choices for git_main We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: I47590aaf84bd2481d53c04889c2963e02b7a816d --- AndroidProducts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 909c83f..4328e37 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -21,4 +21,4 @@ PRODUCT_MAKEFILES := \ COMMON_LUNCH_CHOICES := \ - aosp_bluejay-userdebug + aosp_bluejay-trunk_staging-userdebug -- cgit v1.2.3 From 8f9b6dbaaa8e78c8ded400d19d2f7d89fdaf2fd8 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 26 Oct 2023 05:11:04 +0000 Subject: Update bluejay SVN to 52 Bug: 302612466 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 fac3875..e0c426e 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 += \ -- cgit v1.2.3 From c3b88049bd72c1331792995a29e7e3d23759e48f Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 25 Oct 2023 18:34:24 +0800 Subject: Split bootloader prebuilt to 24Q1 and trunk version Bug: 299879102 Change-Id: I4ff8225a008947d82b0a5517ea156bea36215f00 --- bluejay/BoardConfig.mk | 6 +++++- device-bluejay.mk | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 0cea971..09f98be 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -21,7 +21,11 @@ else endif RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_BLUEJAY_BOOTLOADER_DIR) +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif # Enable load module in parallel BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true diff --git a/device-bluejay.mk b/device-bluejay.mk index 680247e..214a814 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -40,6 +40,11 @@ include device/google/gs-common/touch/stm/stm11.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/trunk +endif $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -136,6 +141,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Trusty liboemcrypto.so 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 +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk +endif # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 -- cgit v1.2.3 From c4f8b78d61179b7b6e4ee6f1858c61a150c46527 Mon Sep 17 00:00:00 2001 From: Will Song Date: Fri, 27 Oct 2023 21:27:32 +0000 Subject: PREUPLOAD: Enforce jsonlint in preupload Checks syntax and simple brace balances for all JSON files. Test: Edit any json file and try upload Bug: 127794899 Change-Id: Ic6f1dbb7fb467be8479f19f1b199921c00d3f5d5 --- PREUPLOAD.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 PREUPLOAD.cfg diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..3826687 --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Builtin Hooks] +jsonlint = true \ No newline at end of file -- cgit v1.2.3 From e9b8123612601ac51c1c2bc5a132fc96b034fedf Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 11 Sep 2023 20:39:10 -0700 Subject: powerhint: add game mode tuning nodes Add down_rate_limit_us nodes, tapered_dvfs_headroom nodes. Test: build Bug: 295636226 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit: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", -- cgit v1.2.3 From 1285e6a938c57cc22ca92484b411f7b85ba5f948 Mon Sep 17 00:00:00 2001 From: Yvonne Yip Date: Mon, 11 Sep 2023 20:41:59 -0700 Subject: 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", -- cgit v1.2.3 From 75bff8a95f3e1fbeeaffce4d2fe720152761edbd Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 14:58:26 +0000 Subject: Revert "bluejay: Replace NFC app with NFC apex" Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056 Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056 Bug: 309117462 Change-Id: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6 Test: Compiles, device boots up --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index f1560b2..ad30f01 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -104,7 +104,7 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st -- cgit v1.2.3 From 041ffd8ea61c819aa02f73440b890101038ab694 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 19:04:14 +0000 Subject: Revert "bluejay(nfc): Modify NFC overlays for NFC apex" Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://android-review.googlesource.com/q/commit:40ba66aca3ed1c1e5d3a7dbbaffa0b73ec4d396c) Merged-In: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da Change-Id: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da --- .../packages/apps/Nfc/res/values/config.xml | 35 ++++++++++++++++++++++ bluejay/rro_overlays/NfcOverlay/Android.bp | 9 ------ .../rro_overlays/NfcOverlay/AndroidManifest.xml | 27 ----------------- bluejay/rro_overlays/NfcOverlay/OWNERS | 2 -- .../rro_overlays/NfcOverlay/res/values/config.xml | 35 ---------------------- device-bluejay.mk | 3 +- 6 files changed, 36 insertions(+), 75 deletions(-) create mode 100644 bluejay/overlay/packages/apps/Nfc/res/values/config.xml delete mode 100644 bluejay/rro_overlays/NfcOverlay/Android.bp delete mode 100644 bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml delete mode 100644 bluejay/rro_overlays/NfcOverlay/OWNERS delete mode 100644 bluejay/rro_overlays/NfcOverlay/res/values/config.xml diff --git a/bluejay/overlay/packages/apps/Nfc/res/values/config.xml b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml new file mode 100644 index 0000000..5610991 --- /dev/null +++ b/bluejay/overlay/packages/apps/Nfc/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + + GB62Z + G1AZG + GX7AS + GB17L + + true + + 70 + 150 + false + + 36 + + + 83 + + diff --git a/bluejay/rro_overlays/NfcOverlay/Android.bp b/bluejay/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index c38f6c9..0000000 --- a/bluejay/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 5241aa4..0000000 --- a/bluejay/rro_overlays/NfcOverlay/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - diff --git a/bluejay/rro_overlays/NfcOverlay/OWNERS b/bluejay/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/bluejay/rro_overlays/NfcOverlay/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index 5610991..0000000 --- a/bluejay/rro_overlays/NfcOverlay/res/values/config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - false - - GB62Z - G1AZG - GX7AS - GB17L - - true - - 70 - 150 - false - - 36 - - - 83 - - diff --git a/device-bluejay.mk b/device-bluejay.mk index 7a26ef6..b470757 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -111,8 +111,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ com.android.nfcservices \ Tag \ - android.hardware.nfc-service.st \ - NfcOverlayBluejay + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ -- cgit v1.2.3 From 07440b702a23cb0c2e86027986fe57e7148431b0 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Tue, 7 Nov 2023 03:16:30 +0000 Subject: Update bluejay SVN to 53 Bug: 309529736 Change-Id: I1b51751e908872be4c140ebf19dd1d291d3de1b4 --- device-bluejay.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-bluejay.mk b/device-bluejay.mk index a95e7b8..4cb4b43 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=52 + ro.vendor.build.svn=53 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ -- cgit v1.2.3 From 794f6831d7dcf6d06720a168b3e5f1ad504bd064 Mon Sep 17 00:00:00 2001 From: "Becker (Chan-Ying) Lien" Date: Tue, 7 Nov 2023 09:18:54 +0000 Subject: Update ShannonIms CERTIFICATE to PRESIGNED Bug: 298956897 Change-Id: I0680982853a630b2c3744278f7a09b356ff2cb69 --- self-extractors/google_devices/staging/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk index 4bb909d..6c380d9 100644 --- a/self-extractors/google_devices/staging/Android.mk +++ b/self-extractors/google_devices/staging/Android.mk @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -- cgit v1.2.3 From 9b3e8fd79104df8b3a66f0bb550346c39dffa07c Mon Sep 17 00:00:00 2001 From: "Becker (Chan-Ying) Lien" Date: Tue, 7 Nov 2023 09:18:54 +0000 Subject: Update ShannonIms CERTIFICATE to PRESIGNED Bug: 298956897 Change-Id: I0680982853a630b2c3744278f7a09b356ff2cb69 --- self-extractors/google_devices/staging/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk index 4bb909d..6c380d9 100644 --- a/self-extractors/google_devices/staging/Android.mk +++ b/self-extractors/google_devices/staging/Android.mk @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE -- cgit v1.2.3 From dace0749781aecaedff67e5ba8251521525b4e91 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Thu, 16 Nov 2023 05:20:36 +0000 Subject: gps: Enable Vzw SUPL OTDOA Bug: 310795649 Test: OTDOA test in b/310795649 Change-Id: I65e76c36c382fd51a32dc0b129250ea6a3dc6be3 --- gps.xml.b3 | 2 +- gps_user.xml.b3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gps.xml.b3 b/gps.xml.b3 index 6e739e7..bed707a 100644 --- a/gps.xml.b3 +++ b/gps.xml.b3 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/gps_user.xml.b3 b/gps_user.xml.b3 index 7e321e8..ca7ae02 100644 --- a/gps_user.xml.b3 +++ b/gps_user.xml.b3 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" -- cgit v1.2.3 From 97ca2e0e167579aa847957dd6c044eceff6a0a17 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 Nov 2023 06:19:56 +0000 Subject: 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 += \ -- cgit v1.2.3 From 35de536662907b57cb115afb3446096fb15e0d8b Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: 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 -- cgit v1.2.3 From 13426a9d37641687908d97c969a2c547eb5f19cd Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: 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 ++++++ .../rro_overlays/NfcOverlay/AndroidManifest.xml | 27 +++++++++++++++++ bluejay/rro_overlays/NfcOverlay/OWNERS | 2 ++ .../rro_overlays/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 += \ -- cgit v1.2.3 From e765ab049dff6dcda28e57e9caf6fc8058f8d591 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 13 Dec 2023 14:09:47 +0800 Subject: 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 -- cgit v1.2.3