diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-16 02:56:34 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-16 02:56:34 +0000 |
commit | 5aa0e4241029c80617a8e98b07f7f48ab6b3a3d7 (patch) | |
tree | 4c771c3635f08242bc49ac2b1381ec85eb0806bf | |
parent | 2d8a30db313443146ad17ddf8db00b127a64f4c2 (diff) | |
parent | d7d475d470de7bb291034d1d61ec832bc1d2bbbb (diff) | |
download | core-android10-s3-release.tar.gz |
Merge cherrypicks of [8662136, 8662137, 8660337, 8660601, 8660073, 8660074, 8660602, 8662138, 8660127] into qt-releaseandroid-vts-10.0_r1android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release
Change-Id: I1b633749a669e778f4bac2ac01df0811b5cef7ac
-rw-r--r-- | rootdir/init.rc | 1 | ||||
-rw-r--r-- | sdcard/sdcard.cpp | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index c042c4897..893998cee 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -589,6 +589,7 @@ on post-fs-data symlink /data/data /data/user/0 mkdir /data/media 0770 media_rw media_rw + mkdir /data/media/obb 0770 media_rw media_rw mkdir /data/cache 0770 system cache mkdir /data/cache/recovery 0770 system cache diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp index 0acea7266..2b358197a 100644 --- a/sdcard/sdcard.cpp +++ b/sdcard/sdcard.cpp @@ -214,14 +214,7 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe if (multi_user) { std::string obb_path = source_path + "/obb"; - // Only attempt to prepare the /obb dir if it already exists. We want - // the legacy obb path "/data/media/obb" to be fixed up so that we can - // migrate it to its new location, but we don't want the directory to be - // created if it doesn't already exist. - struct stat sb; - if (TEMP_FAILURE_RETRY(lstat(obb_path.c_str(), &sb)) == 0) { - fs_prepare_dir(obb_path.c_str(), 0775, uid, gid); - } + fs_prepare_dir(obb_path.c_str(), 0775, uid, gid); } exit(0); |