summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-12-29 19:07:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-12-29 19:07:55 +0000
commitf6e442814abf261be425218323ea2dff075b5a67 (patch)
tree62f524239f6f4c778722efa2c2d68c7c7e979c16
parentd5163650db082dc105d4d1cbd32e58668469544f (diff)
parenta777944a5eb8fc8bd783ad51001a76420333df39 (diff)
downloadbase-f6e442814abf261be425218323ea2dff075b5a67.tar.gz
Merge "mkdir .incomplete in backing storage to fix CTS/GTS failures" into android11-tests-dev
-rw-r--r--services/incremental/IncrementalService.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp
index a5f0d045948c..338ede283e1a 100644
--- a/services/incremental/IncrementalService.cpp
+++ b/services/incremental/IncrementalService.cpp
@@ -476,6 +476,9 @@ StorageId IncrementalService::createStorage(std::string_view mountPoint,
if (!mkdirOrLog(path::join(backing, ".index"), 0777)) {
return kInvalidStorageId;
}
+ if (!mkdirOrLog(path::join(backing, ".incomplete"), 0777)) {
+ return kInvalidStorageId;
+ }
auto status = mVold->mountIncFs(backing, mountTarget, 0, &controlParcel);
if (!status.isOk()) {
LOG(ERROR) << "Vold::mountIncFs() failed: " << status.toString8();