Update raven SVN to 40 am: 773d299c59 am: 4cf86d29ad
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/19911939
Change-Id: Ia7ef022ba0571ea190fa3eb45b4bfa83fcebebc5
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>
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index d0585d9..e29bea2 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -16,6 +16,6 @@
LOCAL_UWB_CAL_DIR=device/google/raviole/uwb
PRODUCT_COPY_FILES += \
- $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \
- $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \
- $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \
+ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \
+ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \
+ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \