From 05d63492d346c533de42dd6353b4c6bea7ab38d7 Mon Sep 17 00:00:00 2001
From: Kris Chen <chenkris@google.com>
Date: Sun, 20 Feb 2022 16:40:08 +0800
Subject: [PATCH 1/3] B3: Enable UDFPS ALS feed forward

Bug: 197789721
Test: Perform fingerprint authentication test with solar simulator.
Change-Id: I81bece46acf2c635a4a521172a0eafdddfde12df
---
 device-bluejay.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-bluejay.mk b/device-bluejay.mk
index 9c0d02c..8b845d1 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -173,6 +173,10 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES +=\
     persist.vendor.fingerprint.disable.fake.override=none
 
+# Fingerprint als feed forward
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.udfps.als_feed_forward_supported=true
+
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \

From 0f94b3667e7cb8ea8509bad79225ec71b5a657c8 Mon Sep 17 00:00:00 2001
From: Joe Huang <joethhuang@google.com>
Date: Thu, 10 Mar 2022 18:07:05 +0800
Subject: [PATCH 2/3] gps: Enable PPS

Enable GNSS PPS feature

Bug: 209960915
Test: Gnss measurement elapsedrealtime work && suspend/resume work && GNSS sanity test
Change-Id: Ib2131adb8186a28f0b286b326c48e5938e9c55d5
---
 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 17c8a9c..e7dcb9c 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -56,9 +56,11 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
diff --git a/gps_user.xml.b3 b/gps_user.xml.b3
index d752cc9..a1e3ea0 100644
--- a/gps_user.xml.b3
+++ b/gps_user.xml.b3
@@ -55,9 +55,11 @@
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
+       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
   />
 
   <gll
+       PpsEnable="true"
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"

From 55e3cccca53a60617b9e25157ca136bc5b10abe2 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 10 Mar 2022 10:50:38 +0000
Subject: [PATCH 3/3] Bundle handheld_core_hardware.xml

Bug: 223543820
Test: Manual, verify build artifacts
Change-Id: I2bc6e7427eaecc4ec9a57c64bd2fa84728d4cb4b
---
 device-bluejay.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-bluejay.mk b/device-bluejay.mk
index 9c0d02c..c7e413f 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -224,3 +224,7 @@ PRODUCT_SHIPPING_API_LEVEL := 32
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.vendor.vibrator.hal.supported_primitives=243
+
+# Device features
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml