Snap for 8698879 from a020527c7b to tm-release

Change-Id: I526c8825c2d3f59d81c15a469b8fb5c63b75785a

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

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 += \

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

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>