summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-02-19 02:09:12 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-02-19 02:09:12 +0000
commitd1f1057e7db7de357f3ddbfe45a49e3767ccb5f7 (patch)
tree6678c8767dffcae8671f2a62f86b618f43e56b5a
parent56dc8b54aee74e7575edd002bdce2b6fea39b1ad (diff)
parente3b8d7a0606524a882060c66fa2478811900da0a (diff)
downloadgsid-d1f1057e7db7de357f3ddbfe45a49e3767ccb5f7.tar.gz
Snap for 7155190 from e3b8d7a0606524a882060c66fa2478811900da0a to sc-d1-release
Change-Id: I0bb731f0273eb8a1ae8e41e3223d87a0ce5aa4c1
-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();
}