diff options
| author | Yo Chiang <yochiang@google.com> | 2020-12-31 04:20:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-31 04:20:41 +0000 |
| commit | 367d870dcccce35e9cb88e865987d6879f73f99d (patch) | |
| tree | 51288620f58016ab51b5c82b7356630605f3ee89 | |
| parent | 8a9ba1b188634d48571742566803cdd52aa30f4b (diff) | |
| parent | 2206c0ab4fa069478fbb2cdebdda6cd7db2661f6 (diff) | |
| download | gsid-367d870dcccce35e9cb88e865987d6879f73f99d.tar.gz | |
Revert "GsiService::enableGsi() checks return code of FinishInstall()" am: fdd02739c2 am: 2206c0ab4f
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec366a31427c11975a2eac136beb13f0c4c5757b
| -rw-r--r-- | gsi_service.cpp | 6 |
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()) { |