diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-18 23:14:24 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-18 23:14:24 +0000 |
| commit | 29e846847ff89c39c7cb864b28b1ec6d16ac3ecf (patch) | |
| tree | 2ecfaa19bf4dc146728098ded1660548910f9344 | |
| parent | 4a792614521f82ffa73448483071925a2b77315b (diff) | |
| parent | 2d3cc3b458831550a4a1caccd03c98a4a0def064 (diff) | |
| download | selinux-android10-qpr1-d-release.tar.gz | |
Snap for 5582435 from 2d3cc3b458831550a4a1caccd03c98a4a0def064 to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release
Change-Id: I51758254b6e3b5da80375f1e029565aabe98a2e8
| -rw-r--r-- | libselinux/src/android/android_platform.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libselinux/src/android/android_platform.c b/libselinux/src/android/android_platform.c index c0e60440..83a795a7 100644 --- a/libselinux/src/android/android_platform.c +++ b/libselinux/src/android/android_platform.c @@ -1324,6 +1324,7 @@ struct pkg_info *package_info_lookup(const char *name) * 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 @@ static int selinux_android_restorecon_common(const char* pathname_orig, 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 |