commit 0f6c33ec2e24cfdb50c6a6f78cccd3c4d4b7b329
author Howard Chen <howardsoc@google.com> Wed Nov 15 05:25:17 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 15 05:25:17 2023 +0000
tree f62fff8113faf169251d1e5250c91770571904a8
parent 091edc859d3ee5bb0c5f132911b849dd4d6c28a4
parent 7a206aadd43ee6fb936781fd417b049901fcdc5a

Merge "Fix the callback status" into main am: 23564a4a26 am: 7a206aadd4

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/2825812

Change-Id: I9e89617c7f61fbd474b9f6ca74dc53d59928f536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

gsi_service.cpp

diff --git a/gsi_service.cpp b/gsi_service.cpp
index 18e97ff..6f2428d 100644
--- a/gsi_service.cpp
+++ b/gsi_service.cpp
@@ -352,9 +352,10 @@
 }
 
 binder::Status GsiService::removeGsiAsync(const sp<IGsiServiceCallback>& resultCallback) {
-    bool result = false;
-    auto status = removeGsi(&result);
-    if (!status.isOk()) {
+    int result = IGsiService::INSTALL_OK;
+    bool success = true;
+    auto status = removeGsi(&success);
+    if (!status.isOk() || !success) {
         LOG(ERROR) << "Could not removeGsi: " << status.exceptionMessage().c_str();
         result = IGsiService::INSTALL_ERROR_GENERIC;
     }