summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi-Yo Chiang <yochiang@google.com>2021-02-18 05:20:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-18 05:20:42 +0000
commit124afd89267559544b12567b7b2b991720913c26 (patch)
tree6678c8767dffcae8671f2a62f86b618f43e56b5a
parent99e0277ae43d66c8c755acc2c0ccd63b8a899af8 (diff)
parentc4d64008ac77f150e7d5191a6da1f59699f0f7dc (diff)
downloadgsid-124afd89267559544b12567b7b2b991720913c26.tar.gz
gsid: Make createPartition() don't preempttively clear installer_ am: c4d64008ac
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1585026 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia1ba41af7a1bcd140feee6146239efd78c2bea59
-rw-r--r--gsi_service.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/gsi_service.cpp b/gsi_service.cpp
index 66e01ee..e4052b2 100644
--- a/gsi_service.cpp
+++ b/gsi_service.cpp
@@ -173,9 +173,6 @@ binder::Status GsiService::createPartition(const ::std::string& name, int64_t si
return binder::Status::ok();
}
- // Make sure a pending interrupted installations are cleaned up.
- installer_ = nullptr;
-
// Do some precursor validation on the arguments before diving into the
// install process.
if (size % LP_SECTOR_SIZE) {
@@ -202,11 +199,7 @@ binder::Status GsiService::createPartition(const ::std::string& name, int64_t si
installer_ = std::make_unique<PartitionInstaller>(this, install_dir_, name,
GetDsuSlot(install_dir_), size, readOnly);
progress_ = {};
- int status = installer_->StartInstall();
- if (status != INSTALL_OK) {
- installer_ = nullptr;
- }
- *_aidl_return = status;
+ *_aidl_return = installer_->StartInstall();
return binder::Status::ok();
}