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

Commit 52b4e753 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Enable searching for mounted public volumes under any user" into main

parents 19183730 0b4d20d1

cmds/installd/InstalldNativeService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ static constexpr const char* kFuseProp = "persist.sys.fuse"; 
 */

static constexpr const char* kAppDataIsolationEnabledProperty = "persist.zygote.app_data_isolation";

static constexpr const char* kMntSdcardfs = "/mnt/runtime/default/";

static constexpr const char* kMntFuse = "/mnt/pass_through/0/";



static std::atomic<bool> sAppDataIsolationEnabled(false);
@@ -3697,7 +3696,9 @@ binder::Status InstalldNativeService::invalidateMounts() { 
        std::getline(in, ignored);



        if (android::base::GetBoolProperty(kFuseProp, false)) {

            if (target.find(kMntFuse) == 0) {

            const std::regex kMntFuseRe =

                    std::regex(R"(^/mnt/pass_through/(0|[0-9]+/[A-Z0-9]{4}-[A-Z0-9]{4}).*)");

            if (std::regex_match(target, kMntFuseRe)) {

                LOG(DEBUG) << "Found storage mount " << source << " at " << target;

                mStorageMounts[source] = target;

            }