From aa95ad8897967373e3129e40ce76aada5f0d2d12 Mon Sep 17 00:00:00 2001
From: Zac Iqbal <zacharyi@google.com>
Date: Thu, 9 Jun 2022 18:55:40 +0000
Subject: [PATCH] Revert "DO NOT MERGE Remove unintended faceauth configs am:
 a020..."

Revert "DO NOT MERGE Remove unintended face config am: 875235afbf"

Revert submission 18799414-am-e98f52416a40436ba0044e72d6feed21

Reason for revert: The merge path was only meant for tm-dev.
Reverted Changes:
I6ace51cab:DO NOT MERGE Remove faceauth from raven am: 783e56...
I049a9c205:DO NOT MERGE Remove unintended face config am: 875...
I50ae185c6:DO NOT MERGE Remove unintended faceauth configs am...

Change-Id: I26f6409b50769dac5509313a32517cb270edc779
---
 conf/init.raven.rc                                           | 4 ++++
 raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 2 files changed, 7 insertions(+)

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 @@ 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 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>