Update raven SVN to 40 am: 773d299c59
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/19911939
Change-Id: I229e5034746972564251c8dad7b9cea5617cdd6e
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/device-oriole.mk b/device-oriole.mk
index aa541dc..5699ff7 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -241,3 +241,13 @@
# Device features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
+
+# Dolby integration
+-include vendor/dolby/ds/dolby-buildspec.mk
+$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk)
+# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml
+PRODUCT_COPY_FILES := \
+ device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
+ $(PRODUCT_COPY_FILES)
+
+PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/device-raven.mk b/device-raven.mk
index 0f62834..cc0b350 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -255,3 +255,13 @@
# Device features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
+
+# Dolby integration
+-include vendor/dolby/ds/dolby-buildspec.mk
+$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk)
+# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml
+PRODUCT_COPY_FILES := \
+ device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
+ $(PRODUCT_COPY_FILES)
+
+PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/media_codecs_dolby_c2.xml b/media_codecs_dolby_c2.xml
new file mode 100644
index 0000000..e7ecfd9
--- /dev/null
+++ b/media_codecs_dolby_c2.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<MediaCodecs>
+ <Include href="media_codecs_aosp_c2.xml" />
+ <Decoders>
+ <MediaCodec name="c2.google.av1.decoder" type="video/av01">
+ <Limit name="size" min="96x96" max="3840x2160" />
+ <Limit name="alignment" value="2x2" />
+ <Limit name="block-size" value="16x16" />
+ <Limit name="block-count" range="36-32400" />
+ <Limit name="blocks-per-second" min="24" max="1944000" />
+ <Limit name="bitrate" range="1-120000000" />
+ <Limit name="frame-rate" range="1-180" />
+ <Limit name="concurrent-instances" max="16" />
+ <Limit name="performance-point-1280x720" value="180" />
+ <Limit name="performance-point-1920x1080" value="120" />
+ <Limit name="performance-point-3840x2160" value="60" />
+ <Feature name="adaptive-playback" />
+ <Feature name="can-swap-width-height" value="1" />
+ </MediaCodec>
+ <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
+ <Limit name="size" min="96x96" max="3840x2160" />
+ <Limit name="alignment" value="2x2" />
+ <Limit name="block-size" value="16x16" />
+ <Limit name="block-count" range="36-32400" />
+ <Limit name="blocks-per-second" min="24" max="1944000" />
+ <Limit name="bitrate" range="1-120000000" />
+ <Limit name="frame-rate" range="1-180" />
+ <Limit name="concurrent-instances" max="16" />
+ <Limit name="performance-point-1280x720" value="180" />
+ <Limit name="performance-point-1920x1080" value="120" />
+ <Limit name="performance-point-3840x2160" value="60" />
+ <Feature name="adaptive-playback" />
+ <Feature name="secure-playback" required="true" />
+ <Feature name="can-swap-width-height" value="1" />
+ </MediaCodec>
+ <MediaCodec name="c2.dolby.eac3.decoder">
+ <Type name="audio/ac3">
+ <Alias name="OMX.dolby.ac3.decoder"/>
+ <Limit name="channel-count" max="6"/>
+ <Limit name="sample-rate" ranges="32000,44100,48000"/>
+ <Limit name="bitrate" range="32000-640000"/>
+ </Type>
+ <Attribute name="software-codec"/>
+ <Type name="audio/eac3">
+ <Alias name="OMX.dolby.eac3.decoder"/>
+ <Limit name="channel-count" max="8"/>
+ <Limit name="sample-rate" ranges="32000,44100,48000"/>
+ <Limit name="bitrate" range="32000-6144000"/>
+ </Type>
+ </MediaCodec>
+ </Decoders>
+</MediaCodecs>
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 \