commit 430db867d4a36f2dd9b5f813a268f40c32f76aa4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jan 21 16:06:36 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 16:06:36 2025 -0800
tree 7dda8b1c076337b9d326dc5fa818eb490ac93f88
parent 52b4e75352b247ed97af76972579a2b472d07f73
parent ba4ca763b33c6aa6657304a3d16bf3ae324d1063

Merge "Add methods to get vectors." into main

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 4486bd6..db56551 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -119,7 +119,6 @@
  */
 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 @@
         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;
             }