diff options
| author | Daniel Rosenberg <drosen@google.com> | 2019-07-15 19:56:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-07-15 19:56:35 +0000 |
| commit | 11bf3545abd52aad9ca7c83ecfd0bb8b109205cd (patch) | |
| tree | 4c771c3635f08242bc49ac2b1381ec85eb0806bf | |
| parent | ff7da227dbe0f52d3eb9a3791cd19af99efda302 (diff) | |
| parent | 35708b9d7bcae0f9183de2848d782b2d0c54bcb6 (diff) | |
| download | system_core-11bf3545abd52aad9ca7c83ecfd0bb8b109205cd.tar.gz system_core-11bf3545abd52aad9ca7c83ecfd0bb8b109205cd.tar.bz2 system_core-11bf3545abd52aad9ca7c83ecfd0bb8b109205cd.zip | |
Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
| -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); |