Merge "Fix an out-of-bounds read in assoc_next."
diff --git a/db845c/device.mk b/db845c/device.mk
index c6825a3..2240981 100644
--- a/db845c/device.mk
+++ b/db845c/device.mk
@@ -32,6 +32,12 @@
# Build generic Audio HAL
PRODUCT_PACKAGES := audio.primary.db845c
+# BootControl HAL
+PRODUCT_PACKAGES += \
+ android.hardware.boot@1.1-impl \
+ android.hardware.boot@1.1-impl.recovery \
+ android.hardware.boot@1.1-service
+
PRODUCT_PACKAGES += \
pd-mapper \
qrtr-ns \
diff --git a/fstab.common b/fstab.common
index 1cdac6e..f9023ad 100644
--- a/fstab.common
+++ b/fstab.common
@@ -2,6 +2,7 @@
/dev/block/platform/soc@0/1d84000.ufshc/by-name/userdata /data ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,quota
/dev/block/platform/soc@0/1d84000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable
/dev/block/platform/soc@0/1d84000.ufshc/by-name/cache /cache ext4 nodev,noatime,nosuid,errors=panic wait
+/dev/block/platform/soc@0/1d84000.ufshc/by-name/misc /misc emmc defaults defaults
/devices/platform/soc@0/8804000.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto
vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
diff --git a/manifest.xml b/manifest.xml
index 10362de..0c7ae03 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="2">
+<manifest version="1.0" type="device" target-level="3">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index bc69fcc..f70cc5f 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -5,6 +5,7 @@
/dev/block/platform/soc@0/1d84000\.ufshc/by-name/super u:object_r:super_block_device:s0
/dev/block/platform/soc@0/1d84000\.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
/dev/block/platform/soc@0/1d84000\.ufshc/by-name/cache u:object_r:cache_block_device:s0
+/dev/block/platform/soc@0/1d84000\.ufshc/by-name/misc u:object_r:misc_block_device:s0
/dev/dri u:object_r:dri_device:s0
/dev/dri/card0 u:object_r:graphics_device:s0