Better status message.
Bug: 263449831
Test: adb shell dumpsys incremental
Change-Id: Ie6960d22c1d0e018b50de1c9e431c403fe442458
diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index 9c9b363..5e6200c 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -419,6 +419,17 @@
return nowUs - monoTsUs;
}
+static const char* loadingStateToString(incfs::LoadingState state) {
+ switch (state) {
+ case (incfs::LoadingState::Full):
+ return "Full";
+ case (incfs::LoadingState::MissingBlocks):
+ return "MissingBlocks";
+ default:
+ return "error obtaining loading state";
+ }
+}
+
void IncrementalService::onDump(int fd) {
dprintf(fd, "Incremental is %s\n", incfs::enabled() ? "ENABLED" : "DISABLED");
dprintf(fd, "IncFs features: 0x%x\n", int(mIncFs->features()));
@@ -453,9 +464,13 @@
}
dprintf(fd, " storages (%d): {\n", int(mnt.storages.size()));
for (auto&& [storageId, storage] : mnt.storages) {
- dprintf(fd, " [%d] -> [%s] (%d %% loaded) \n", storageId, storage.name.c_str(),
+ auto&& ifs = getIfsLocked(storageId);
+ dprintf(fd, " [%d] -> [%s] (%d %% loaded)(%s) \n", storageId,
+ storage.name.c_str(),
(int)(getLoadingProgressFromPath(mnt, storage.name.c_str()).getProgress() *
- 100));
+ 100),
+ ifs ? loadingStateToString(mIncFs->isEverythingFullyLoaded(ifs->control))
+ : "error obtaining ifs");
}
dprintf(fd, " }\n");