Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9aff986 authored by Gerry Fan's avatar Gerry Fan Committed by android-build-merger
Browse files

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

am: ff7da227

Change-Id: I42b5fdcdb6b87afe44353d830f6b1b5c0c645fc0
parents d2e75075 ff7da227

rootdir/init.rc

+0 −1
Original line number Diff line number Diff line
@@ -589,7 +589,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

sdcard/sdcard.cpp

+8 −1
Original line number Diff line number Diff line
@@ -214,8 +214,15 @@ 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);

        }

    }



    exit(0);

}