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

Commit d62c31d3 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master 

Bug: 139893257
Change-Id: Ib69c986e30b903cc48ca835fb307acf569930806
parents 750fac4e 5aa0e424

rootdir/init.rc

+1 −0
Original line number Diff line number Diff line
@@ -607,6 +607,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);

}