am e2d412f0: am e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."

* commit 'e2d412f0466ac6a1a33e2c2563ed2192b58bfa87':
  restorecon /data/media when re-creating it for multi-user upgrade.
This commit is contained in:
Nick Kralevich 2013-12-17 23:18:58 +00:00 committed by Android Git Automerger
commit b281d81404

View File

@ -392,6 +392,10 @@ int initialize_directories() {
goto fail; goto fail;
} }
if (selinux_android_restorecon(android_media_dir.path)) {
goto fail;
}
// /data/media/0 // /data/media/0
char owner_media_dir[PATH_MAX]; char owner_media_dir[PATH_MAX];
snprintf(owner_media_dir, PATH_MAX, "%s0", android_media_dir.path); snprintf(owner_media_dir, PATH_MAX, "%s0", android_media_dir.path);