commit 9596d6d4c770dce5df7ddbe7f772cbc024daaa17
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 10 16:30:21 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 10 16:30:21 2019 +0000
tree ef78814bfa2e2bb3688f5bafc5778b22e799a610
parent e8bdbdeeabb557910cafa52cc6c41fb09c491a89
parent e7aaa0c273f6075684d6ddfc4c30495ebc069aa2

Merge "Re-label /data/pkg_staging files as staging."

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 87b408d..c8c881d 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -453,6 +453,8 @@
 /data/mediadrm(/.*)?	u:object_r:media_data_file:s0
 /data/nativetest(/.*)?	u:object_r:nativetest_data_file:s0
 /data/nativetest64(/.*)?	u:object_r:nativetest_data_file:s0
+# This directory was removed after Q Beta 2, but we need to preserve labels for upgrading devices.
+/data/pkg_staging(/.*)?		u:object_r:staging_data_file:s0
 /data/property(/.*)?	u:object_r:property_data_file:s0
 /data/preloads(/.*)?	u:object_r:preloads_data_file:s0
 /data/preloads/media(/.*)?	u:object_r:preloads_media_file:s0