Snap for 11104212 from 10114d20d712183db4dedce08e4d593cdd08f292 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: If7000661e13bf8ea31c4cca7493734f13bae9ba8

1 files changed, 4 insertions, 3 deletions

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::isGsiEnabled(bool* _aidl_return) {
 }
 
 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;
     }