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

Bug: 210921116
Test: N/A
Change-Id: Ie10aaca6892b1246b57941d00b283f202b08035d
(cherry picked from commit a95098f01bc8d0592f66a34263530774fcfeee4f)
Merged-In: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 af9fbfc..4d5d2a9 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 c68e625..7da850b 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -200,9 +200,6 @@
          -->
     <dimen name="status_bar_height">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>
 </resources>

From 836db9082621aef4f3227703f94534664916564b Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Wed, 15 Dec 2021 17:53:48 +0800
Subject: [PATCH 2/3] Update SVN to 21 for O6R4 Feb MPR 2022

Bug: 208388283
Change-Id: Ibed22f512bb16e2166b81a783a707d0018aa88a3
(cherry picked from commit 0d1967598533d77996ff363d9eeea35914f72410)
Merged-In:Ibed22f512bb16e2166b81a783a707d0018aa88a3
---
 device-oriole.mk | 2 +-
 device-raven.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 67037b6..1966458 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=20
+    ro.vendor.build.svn=21
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index b2e5e87..8f069b4 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -183,7 +183,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=20
+    ro.vendor.build.svn=21
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From 08655b8f12788cdb89e5bdf36a26d1517c583731 Mon Sep 17 00:00:00 2001
From: Neha Jain <jainne@google.com>
Date: Tue, 25 Jan 2022 02:37:35 +0000
Subject: [PATCH 3/3] Update SVN to 22 for Oriole-Raven for Mar QPR 2022

Bug: 211820647
Change-Id: I834fb190f857c5af462ed4a5e64576fee0010e3e
(cherry picked from commit e905dce4e7612fbc9c2368f9f4d068d2ff50fddc)
Merged-In:I834fb190f857c5af462ed4a5e64576fee0010e3e
---
 device-oriole.mk | 2 +-
 device-raven.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 1966458..bec8875 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -171,7 +171,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=21
+    ro.vendor.build.svn=22
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 8f069b4..bd162df 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -183,7 +183,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=21
+    ro.vendor.build.svn=22
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \