ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev

Browse source
This commit is contained in:
Gerry Fan 2019-07-12 17:11:23 +00:00 • committed by Android (Google) Code Review
commit ff7da227db
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rootdir/init.rc
View file

@ -589,7 +589,6 @@ on post-fs-data
symlink /data/data /data/user/0 symlink /data/data /data/user/0
mkdir /data/media 0770 media_rw media_rw 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 0770 system cache
mkdir /data/cache/recovery 0770 system cache mkdir /data/cache/recovery 0770 system cache

9
sdcard/sdcard.cpp
View file

@ -214,7 +214,14 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe
if (multi_user) { if (multi_user) {
std::string obb_path = source_path + "/obb"; std::string obb_path = source_path + "/obb";
fs_prepare_dir(obb_path.c_str(), 0775, uid, gid); // 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);
}
} }
exit(0); exit(0);