commit e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd
author Nick Kralevich <nnk@google.com> Tue Dec 17 15:08:30 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 17 15:08:30 2013 -0800
tree 141f1d9957de65895b5e52a4db3edc6f576cf2a1
parent 1b5143bfd6ae69ca37ee78e77bd1fcad78c105bd
parent c02c35fbdc90acbb6483fddd9a8822a16a63689d

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

* commit 'c02c35fbdc90acbb6483fddd9a8822a16a63689d':
  restorecon /data/media when re-creating it for multi-user upgrade.

cmds/installd/installd.c

diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c
index f52cee0..0c80dac 100644
--- a/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@ -392,6 +392,10 @@
             goto fail;
         }
 
+        if (selinux_android_restorecon(android_media_dir.path)) {
+            goto fail;
+        }
+
         // /data/media/0
         char owner_media_dir[PATH_MAX];
         snprintf(owner_media_dir, PATH_MAX, "%s0", android_media_dir.path);