commit 62e2709c3ff91760108c31e6f60fcf57c8c8da46
author Jeff Sharkey <jsharkey@android.com> Mon Aug 27 11:42:30 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 27 11:42:30 2012 -0700
tree 370f1898ef0dfce341f0f28e3bc656d8b43d47f7
parent 9d9ea05cde56f6663f57925212c87860d1cbc1b2
parent dc9b0128c52cc797847240e81ebc6de75229a3ab

Merge "Ensure /data/media before trying to upgrade." into jb-mr1-dev

cmds/installd/installd.c

diff --git a/cmds/installd/installd.c b/cmds/installd/installd.c
index 7108d68..d51004a 100644
--- a/cmds/installd/installd.c
+++ b/cmds/installd/installd.c
@@ -384,6 +384,11 @@
         // Introducing multi-user, so migrate /data/media contents into /data/media/0
         ALOGD("Migrating /data/media for multi-user");
 
+        // Ensure /data/media
+        if (ensure_dir(android_media_dir.path, 0770, AID_MEDIA_RW, AID_MEDIA_RW) == -1) {
+            goto fail;
+        }
+
         // /data/media.tmp
         char media_tmp_dir[PATH_MAX];
         snprintf(media_tmp_dir, PATH_MAX, "%smedia.tmp", android_data_dir.path);