summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYo Chiang <yochiang@google.com>2020-12-31 03:51:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-31 03:51:43 +0000
commit2206c0ab4fa069478fbb2cdebdda6cd7db2661f6 (patch)
tree51288620f58016ab51b5c82b7356630605f3ee89
parentfce7f2636c8612a9a892bbf82766e06a1f4fe263 (diff)
parentfdd02739c24f76846d37807c17c3424d4f0cf718 (diff)
downloadgsid-2206c0ab4fa069478fbb2cdebdda6cd7db2661f6.tar.gz
Revert "GsiService::enableGsi() checks return code of FinishInstall()" am: fdd02739c2
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536725 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I991394a1bbbceefe2578b9069c8269967f7ef7e0
-rw-r--r--gsi_service.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/gsi_service.cpp b/gsi_service.cpp
index 41b8811..14ef1d4 100644
--- a/gsi_service.cpp
+++ b/gsi_service.cpp
@@ -301,13 +301,7 @@ binder::Status GsiService::enableGsi(bool one_shot, const std::string& dsuSlot,
}
if (installer_) {
ENFORCE_SYSTEM;
- int status = installer_->FinishInstall();
installer_ = {};
- if (status != IGsiService::INSTALL_OK) {
- *_aidl_return = status;
- LOG(ERROR) << "Installation failed, cannot enable DSU for slot: " << dsuSlot;
- return binder::Status::ok();
- }
// Note: create the install status file last, since this is the actual boot
// indicator.
if (!SetBootMode(one_shot) || !CreateInstallStatusFile()) {