Snap for 5582435 from 2d3cc3b458831550a4a1caccd03c98a4a0def064 to qt-qpr1-release
Change-Id: I51758254b6e3b5da80375f1e029565aabe98a2e8
diff --git a/libselinux/src/android/android_platform.c b/libselinux/src/android/android_platform.c
index c0e6044..83a795a 100644
--- a/libselinux/src/android/android_platform.c
+++ b/libselinux/src/android/android_platform.c
@@ -1324,6 +1324,7 @@
* to delay restorecon of those until vold explicitly requests it. */
// NOTE: these paths need to be kept in sync with vold
#define DATA_SYSTEM_CE_PREFIX "/data/system_ce/"
+#define DATA_VENDOR_CE_PREFIX "/data/vendor_ce/"
#define DATA_MISC_CE_PREFIX "/data/misc_ce/"
/* The path prefixes of package data directories. */
@@ -1713,7 +1714,8 @@
if (skipce &&
(!strncmp(ftsent->fts_path, DATA_SYSTEM_CE_PREFIX, sizeof(DATA_SYSTEM_CE_PREFIX)-1) ||
- !strncmp(ftsent->fts_path, DATA_MISC_CE_PREFIX, sizeof(DATA_MISC_CE_PREFIX)-1))) {
+ !strncmp(ftsent->fts_path, DATA_MISC_CE_PREFIX, sizeof(DATA_MISC_CE_PREFIX)-1) ||
+ !strncmp(ftsent->fts_path, DATA_VENDOR_CE_PREFIX, sizeof(DATA_VENDOR_CE_PREFIX)-1))) {
// Don't label anything below this directory.
fts_set(fts, ftsent, FTS_SKIP);
// but fall through and make sure we label the directory itself
