Skip to content

Commit dc9b012

Browse files
committed
Ensure /data/media before trying to upgrade.
Most devices create the path in their init.rc, but create it just to be sure. This fixes emulator boot failure. Bug: 7058844 Change-Id: Icab3ce11c4304d972d13e1d9a0c269cfe05b9370
1 parent 080ca09 commit dc9b012

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

cmds/installd/installd.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,11 @@ int initialize_directories() {
384384
// Introducing multi-user, so migrate /data/media contents into /data/media/0
385385
ALOGD("Migrating /data/media for multi-user");
386386

387+
// Ensure /data/media
388+
if (ensure_dir(android_media_dir.path, 0770, AID_MEDIA_RW, AID_MEDIA_RW) == -1) {
389+
goto fail;
390+
}
391+
387392
// /data/media.tmp
388393
char media_tmp_dir[PATH_MAX];
389394
snprintf(media_tmp_dir, PATH_MAX, "%smedia.tmp", android_data_dir.path);

0 commit comments

Comments
 (0)