From f514128c060f0a96a9039df9d6249befde504cbd Mon Sep 17 00:00:00 2001
From: Kris Chen <chenkris@google.com>
Date: Tue, 24 May 2022 20:15:22 +0800
Subject: [PATCH 1/2] O6R4: Enable UDFPS ALS feed forward

Bug: 197789721
Test: Perform fingerprint authentication test with solar simulator.
Change-Id: I716056279206490e0aa01f72333703349b79e13b
---
 device-oriole.mk | 4 +++-
 device-raven.mk  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index ca4c732..84386ab 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -188,7 +188,9 @@ PRODUCT_PRODUCT_PROPERTIES +=\
 
 # Fingerprint HAL
 PRODUCT_VENDOR_PROPERTIES += \
-    persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
+    persist.vendor.udfps.lhbm_controlled_in_hal_supported=true \
+    persist.vendor.udfps.als_feed_forward_supported=true
+
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/device-raven.mk b/device-raven.mk
index 4145e61..ac526ed 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -195,7 +195,9 @@ PRODUCT_PRODUCT_PROPERTIES +=\
 
 # Fingerprint HAL
 PRODUCT_VENDOR_PROPERTIES += \
-    persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
+    persist.vendor.udfps.lhbm_controlled_in_hal_supported=true \
+    persist.vendor.udfps.als_feed_forward_supported=true
+
 
 # Keyboard side padding in dp for portrait mode
 PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_r=11

From a020527c7b07ff9df2a5f69f869d17448589b59a Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Wed, 15 Dec 2021 16:14:44 -0800
Subject: [PATCH 2/2] DO NOT MERGE Remove unintended faceauth configs

Bug: 210921116
Test: N/A
Change-Id: Ie10aaca6892b1246b57941d00b283f202b08035d
---
 conf/init.raven.rc                                           | 4 ----
 raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/conf/init.raven.rc b/conf/init.raven.rc
index 5153c58..4d35ee1 100644
--- a/conf/init.raven.rc
+++ b/conf/init.raven.rc
@@ -11,10 +11,6 @@ on init
     # Power Stats HAL
     chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats
 
-on fs
-    # Face
-    exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app
-
 on property:vendor.mfgapi.touchpanel.permission=1
     chmod 0600 /sys/devices/virtual/sec/tsp/cmd
     chown system system /sys/devices/virtual/sec/tsp/cmd
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index e945ffd..6fd22bc 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -202,9 +202,6 @@
     <dimen name="status_bar_height_portrait">130px</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
-    <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
-    <bool name="config_faceAuthDismissesKeyguard">false</bool>
-
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>