diff options
| author | Yi-Yo Chiang <yochiang@google.com> | 2021-02-18 06:03:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-18 06:03:14 +0000 |
| commit | 109b93220fb657753d902fd7f53d307c3f39f486 (patch) | |
| tree | 6678c8767dffcae8671f2a62f86b618f43e56b5a | |
| parent | 7cf2e769b6b96cff8008faab5b6cb45b8ed38d0e (diff) | |
| parent | 124afd89267559544b12567b7b2b991720913c26 (diff) | |
| download | gsid-109b93220fb657753d902fd7f53d307c3f39f486.tar.gz | |
gsid: Make createPartition() don't preempttively clear installer_ am: c4d64008ac am: 124afd8926
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1585026
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bcd3d82a5d7680f201dcbbb411e86b12d2b026a
| -rw-r--r-- | gsi_service.cpp | 9 |
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(); } |