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

Commit 5aa0e424 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8662136, 8662137, 8660337, 8660601, 8660073, 8660074,... 

Merge cherrypicks of [8662136, 8662137, 8660337, 8660601, 8660073, 8660074, 8660602, 8662138, 8660127] into qt-release

Change-Id: I1b633749a669e778f4bac2ac01df0811b5cef7ac
parents 2d8a30db d7d475d4

rootdir/init.rc

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

sdcard/sdcard.cpp

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

}