Merge changes I9638e90b,Ib2636dfc
* changes:
logd: replace std::vector<uint8_t> in SerializedLogChunk
logd: fix use after resize of contents_ vector
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 226bcf4..fb6f1be 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -520,6 +520,13 @@
mkdir /metadata/apex 0700 root system
mkdir /metadata/apex/sessions 0700 root system
+ # On some devices we see a weird behaviour in which /metadata/apex doesn't
+ # have a correct label. To workaround this bug, explicitly call restorecon
+ # on /metadata/apex. For most of the boot sequences /metadata/apex will
+ # already have a correct selinux label, meaning that this call will be a
+ # no-op.
+ restorecon_recursive /metadata/apex
+
on late-fs
# Ensure that tracefs has the correct permissions.
# This does not work correctly if it is called in post-fs.