From 2280d38b83b0e84ce22921461df87b02e127b252 Mon Sep 17 00:00:00 2001 From: SalmaxChang Date: Thu, 12 May 2022 17:59:50 +0800 Subject: [PATCH 1/8] gs101: change carrier config path Change to "/vendor/firmware/carrierconfig". Bug: 232364874 Change-Id: I835f20e4e5640323c9d0f0bb8d6b9b11f00560b6 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index c9df7841..f933ae26 100644 --- a/device.mk +++ b/device.mk @@ -111,7 +111,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Carrier configuration default location PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack + persist.vendor.radio.config.carrier_config_dir=/vendor/firmware/carrierconfig PRODUCT_PROPERTY_OVERRIDES += \ From a722d436f8fdaa6424755582a4a50a83d365cb4a Mon Sep 17 00:00:00 2001 From: SalmaxChang Date: Thu, 12 May 2022 17:59:50 +0800 Subject: [PATCH 2/8] gs101: change carrier config path Change to "/vendor/firmware/carrierconfig". Bug: 232364874 Change-Id: I835f20e4e5640323c9d0f0bb8d6b9b11f00560b6 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index cfbf923b..38fa3d96 100644 --- a/device.mk +++ b/device.mk @@ -126,7 +126,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Carrier configuration default location PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack + persist.vendor.radio.config.carrier_config_dir=/vendor/firmware/carrierconfig # Set the Bluetooth Class of Device # Service Field: 0x5A -> 90 From 339875dda808d8b7c66a3fca7947016c7a8897d3 Mon Sep 17 00:00:00 2001 From: jonerlin Date: Sun, 15 May 2022 11:06:22 +0800 Subject: [PATCH 3/8] Enable IBluetoothExt interface feature Bug: 228943442 Test: Manually Change-Id: I98bde91f74c5e4a4ffc6f9a4fb0fff48857de0be --- device_framework_matrix_product.xml | 8 ++++++++ manifest.xml | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 7b191128..a1e4e779 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -102,6 +102,14 @@ default + + hardware.google.bluetooth.ext + 1.0 + + IBluetoothExt + default + + hardware.google.bluetooth.ccc hwbinder diff --git a/manifest.xml b/manifest.xml index a5ca7f37..1d59695c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -115,6 +115,15 @@ default + + hardware.google.bluetooth.ext + hwbinder + 1.0 + + IBluetoothExt + default + + hardware.google.bluetooth.sar hwbinder From e806478dce1116a02bb793092614ce4a4f95ce50 Mon Sep 17 00:00:00 2001 From: eddielan Date: Tue, 26 Apr 2022 15:41:13 +0800 Subject: [PATCH 4/8] manifest: Use fpc42 version for FPS extension Bug: 229685137 Test: make check-vintf-all -j112 Change-Id: I4a8272a44420ff11cf368e99996f2eabf63b6d0c --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 7b191128..9b089359 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -25,7 +25,7 @@ - com.fingerprints35.extension + com.fingerprints42.extension 1.0 IFingerprintAuthenticator From a723e2d1fb011c3f5d86085b21abcd4bf48fefef Mon Sep 17 00:00:00 2001 From: eddielan Date: Mon, 25 Apr 2022 11:35:54 +0800 Subject: [PATCH 5/8] fingerprint: Add .mk files for SW42 Bug: 229685137 Test: Build pass Change-Id: I70b506b7bf16a1688418228015c55ba1fcb30161 --- .../fpc1540/sw42/fingerprint_aidl_config.mk | 19 ++++++++++++ .../sw42/fingerprint_hidl_config_factory.mk | 18 +++++++++++ fingerprint/fpc1540/sw42/fpc1540.mk | 30 +++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk create mode 100644 fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk create mode 100644 fingerprint/fpc1540/sw42/fpc1540.mk diff --git a/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk b/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk new file mode 100644 index 00000000..d036bb3d --- /dev/null +++ b/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk @@ -0,0 +1,19 @@ +# ---------------------------- +# Add feature flags below +# ---------------------------- +FPC_CONFIG_BUILD_VERSION=42 +FPC_CONFIG_GOOGLE_CUSTOMIZE=1 +FPC_CONFIG_HAL_SHARED_LIB=1 +FPC_CONFIG_MAX_NR_TEMPLATES=5 +FPC_CONFIG_NO_TU=0 +FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat +FPC_CONFIG_SENSORTEST=1 +FPC_CONFIG_TA_FS=1 +FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000 +FPC_OTP_DECODE_ERRORS_IGNORE=1 +FPC_SENSOR_SDK_LOG_LEVEL=3 +FPC_TEE_RUNTIME=TRUSTY +LIBFPC_NAME=libfpcmulti_debug.a +FPC_CONFIG_DEBUG=1 +FPC_CONFIG_ENGINEERING=1 +FPC_CONFIG_GOOGLE_RELEASE=1 diff --git a/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk b/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk new file mode 100644 index 00000000..4b2567d8 --- /dev/null +++ b/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk @@ -0,0 +1,18 @@ +# ---------------------------- +# Add feature flags below +# ---------------------------- +FPC_CONFIG_BUILD_VERSION=42 +FPC_CONFIG_GOOGLE_CUSTOMIZE=1 +FPC_CONFIG_MAX_NR_TEMPLATES=5 +FPC_CONFIG_NO_TU=0 +FPC_CONFIG_SENSE_TOUCH_CALIBRATION_PATH=/data/fpc/calibration_sense_touch.dat +FPC_CONFIG_SENSORTEST=1 +FPC_CONFIG_TA_FS=1 +FPC_DEFECTIVE_PIXEL_LIST_SIZE=5000 +FPC_OTP_DECODE_ERRORS_IGNORE=1 +FPC_SENSOR_SDK_LOG_LEVEL=3 +FPC_TEE_RUNTIME=TRUSTY +LIBFPC_NAME=libfpcmulti_debug.a +FPC_CONFIG_DEBUG=1 +FPC_CONFIG_ENGINEERING=1 + diff --git a/fingerprint/fpc1540/sw42/fpc1540.mk b/fingerprint/fpc1540/sw42/fpc1540.mk new file mode 100644 index 00000000..77705388 --- /dev/null +++ b/fingerprint/fpc1540/sw42/fpc1540.mk @@ -0,0 +1,30 @@ +# Factory build, use HIDL hal & extension so that we can use Test tool +ifneq ( ,$(findstring factory, $(TARGET_PRODUCT))) +include device/google/gs101/fingerprint/fpc1540/sw42/fingerprint_hidl_config_factory.mk +PRODUCT_PACKAGES += \ + android.hardware.biometrics.fingerprint@2.1-service.fpc \ + fpc_tee_test\ + SensorTestTool \ + ImageTool \ + ImageCollection \ + fp_test \ + +PRODUCT_PACKAGES += \ + com.fingerprints.extension.xml \ + com.fingerprints.extension \ + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml + +else +# Non facotry build, use fingerprint AIDL version +include device/google/gs101/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk + +PRODUCT_PACKAGES += \ + android.hardware.biometrics.fingerprint-service.fpc42 \ + fingerprint.fpc \ + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml + +endif From 4a24ac4c50199e71ed66fa70630f745aba06abc5 Mon Sep 17 00:00:00 2001 From: eddielan Date: Wed, 4 May 2022 17:12:31 +0800 Subject: [PATCH 6/8] fingerprint: Add congifs for sw42 Followings are the list of flags - FPC_CONFIG_TRUSTY_CLEAN_TA=1 - GOOGLE_CONFIG_PERFORMANCE=1 Cherry-pick from Id0c4e34fb98aa50995449ff66ffe894a37a1bdeb Bug: 231407087 Test: Build Pass & perform authentication on device Change-Id: I56f4ec9ca03445cb7780eb401104bae346ef31b9 --- fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk b/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk index d036bb3d..fe8cf8ba 100644 --- a/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk +++ b/fingerprint/fpc1540/sw42/fingerprint_aidl_config.mk @@ -17,3 +17,12 @@ LIBFPC_NAME=libfpcmulti_debug.a FPC_CONFIG_DEBUG=1 FPC_CONFIG_ENGINEERING=1 FPC_CONFIG_GOOGLE_RELEASE=1 +FPC_CONFIG_TRUSTY_CLEAN_TA=1 + +GOOGLE_CONFIG_PERFORMANCE=1 + +# Enable Suez +$(call soong_config_set,fp_hal_feature,biometric_suez_support,true) + +# Must add below method to each project's device.mk to show sensorLocation +#$(call soong_config_set,fp_hal_feature,pixel_product, project_XX) From adc935563512d9dffc936a6946432bacee300354 Mon Sep 17 00:00:00 2001 From: Allen Xu Date: Thu, 19 May 2022 23:50:20 +0000 Subject: [PATCH 7/8] Add notification pregrant for SCONE Bug: 233243584 Change-Id: I9bb2b014c7edb665a7c2675e86ff4d67cde94b48 Test: manual --- default-permissions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default-permissions.xml b/default-permissions.xml index 81624d3c..50860fed 100644 --- a/default-permissions.xml +++ b/default-permissions.xml @@ -66,6 +66,8 @@ + + Date: Fri, 20 May 2022 14:58:28 +0100 Subject: [PATCH 8/8] Preopt SystemUI for AOSP builds. Bug: 232860596 Test: See no dex2oat invocation on the first boot. Change-Id: I051c3b4f7c1c695f487d527b652203e6e007aa8d --- device.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 38fa3d96..3a85217e 100644 --- a/device.mk +++ b/device.mk @@ -1178,8 +1178,8 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs101/device_framework_matrix_product.xml # Preopt SystemUI -PRODUCT_DEXPREOPT_SPEED_APPS += \ - SystemUIGoogle +PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle # For internal +PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI # For AOSP # Compile SystemUI on device with `speed`. PRODUCT_PROPERTY_OVERRIDES += \