Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62e2709c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

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

parents 9d9ea05c dc9b0128
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -384,6 +384,11 @@ int initialize_directories() {
        // 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);