Avoid sysfs name clashes.
Bug: 187437944
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest ApkVerityInstallTest
Change-Id: Idc8cb4d170b0bfd98ee3a10bdf57439801739757
diff --git a/services/incremental/IncrementalService.h b/services/incremental/IncrementalService.h
index a8434af..5de7325 100644
--- a/services/incremental/IncrementalService.h
+++ b/services/incremental/IncrementalService.h
@@ -340,6 +340,7 @@
mutable std::mutex lock;
const std::string root;
+ const std::string metricsKey;
Control control;
/*const*/ MountId mountId;
int32_t flags = StorageFlags::ReadLogsAllowed;
@@ -350,9 +351,10 @@
std::atomic<int> nextStorageDirNo{0};
const IncrementalService& incrementalService;
- IncFsMount(std::string root, MountId mountId, Control control,
+ IncFsMount(std::string root, std::string metricsKey, MountId mountId, Control control,
const IncrementalService& incrementalService)
: root(std::move(root)),
+ metricsKey(std::move(metricsKey)),
control(std::move(control)),
mountId(mountId),
incrementalService(incrementalService) {}