summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYo Chiang <yochiang@google.com>2020-12-31 04:34:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-31 04:34:08 +0000
commitde1946145c34a22792bdb25d5326fad89ce5f66e (patch)
tree51288620f58016ab51b5c82b7356630605f3ee89
parent04466145017e43ec81aa51176d067b8e519c275e (diff)
parent367d870dcccce35e9cb88e865987d6879f73f99d (diff)
downloadgsid-de1946145c34a22792bdb25d5326fad89ce5f66e.tar.gz
Revert "GsiService::enableGsi() checks return code of FinishInstall()" am: fdd02739c2 am: 2206c0ab4f am: 367d870dcc
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/1536725 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I871d1ba7654ee791e5e8f188ce12975de34d7efe
-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()) {