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

Commit a5a187d6 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Remove write permission from file mode of top-level user dirs" am:... 

Merge "Remove write permission from file mode of top-level user dirs" am: b35c5a08 am: 85d2820a am: 2a14b62f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2624725



Change-Id: I0703a38d6b95523f546ffd45c17068e3b495a98c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a9b66d6 2a14b62f

cmds/installd/InstalldNativeService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -3574,22 +3574,22 @@ binder::Status InstalldNativeService::tryMountDataMirror( 
    std::lock_guard<std::recursive_mutex> lock(mMountsLock);



    std::string mirrorVolCePath(StringPrintf("%s/%s", kDataMirrorCePath, uuid_));

    if (fs_prepare_dir(mirrorVolCePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

    if (fs_prepare_dir(mirrorVolCePath.c_str(), 0511, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create CE data mirror");

    }



    std::string mirrorVolDePath(StringPrintf("%s/%s", kDataMirrorDePath, uuid_));

    if (fs_prepare_dir(mirrorVolDePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

    if (fs_prepare_dir(mirrorVolDePath.c_str(), 0511, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create DE data mirror");

    }



    std::string mirrorVolMiscCePath(StringPrintf("%s/%s", kMiscMirrorCePath, uuid_));

    if (fs_prepare_dir(mirrorVolMiscCePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

    if (fs_prepare_dir(mirrorVolMiscCePath.c_str(), 0511, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create CE misc mirror");

    }



    std::string mirrorVolMiscDePath(StringPrintf("%s/%s", kMiscMirrorDePath, uuid_));

    if (fs_prepare_dir(mirrorVolMiscDePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

    if (fs_prepare_dir(mirrorVolMiscDePath.c_str(), 0511, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create DE misc mirror");

    }