提交: 9e28c5448b0e8adca9b2061496e313d8d9ce4634 - system-core (git)

system/core

Commit MetaInfo

• 修訂: 9e28c5448b0e8adca9b2061496e313d8d9ce4634 (tree)
• 時間: 2019-05-24 20:27:10
• 作者: Narayan Kamath <narayan@goog...>
• Commiter: android-build-merger

Log Message

rootdir / sdcard : Stop creating /data/media/obb.
am: c6ca823710

Change-Id: I429eacda7dc48b7472814dcecf58e1c7262b37fa

Change Summary

• modified: rootdir/init.rc
• modified: sdcard/sdcard.cpp

差異

--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -586,7 +586,6 @@ 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

--- a/sdcard/sdcard.cpp
+++ b/sdcard/sdcard.cpp
@@ -214,7 +214,14 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe
 
     if (multi_user) {
         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);