[automerger skipped] Merge SQ3A.220605.009 am: d8b5b31f8f am: 603a820049 -s ours am: edfcc7c6e7 -s ours
am skip reason: Merged-In I18aa2cb60403b131dcf353f8b51e831a9f4614da with SHA-1 69e753be8a is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2128573
Change-Id: Ib1125c44b80c08423f25d38888158844c8420c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/conf/init.raven.rc b/conf/init.raven.rc
index 4d35ee1..5153c58 100644
--- a/conf/init.raven.rc
+++ b/conf/init.raven.rc
@@ -11,6 +11,10 @@
# 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 6fd22bc..e945ffd 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -202,6 +202,9 @@
<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>