commit b281d8140461322d2a9808244ce9ce3d31b35b9d
author Nick Kralevich <nnk@google.com> Tue Dec 17 23:18:58 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 17 23:18:58 2013 +0000
tree e7a64bfba440c4494fb7f45c1c099deb819df66e
parent 6fce2d2280c28c81de4d3ea6744a4cb1db2ae9db
parent e2d412f0466ac6a1a33e2c2563ed2192b58bfa87

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.

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);