diff options
| author | Howard Chen <howardsoc@google.com> | 2023-11-15 04:54:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-15 04:54:17 +0000 |
| commit | 7a206aadd43ee6fb936781fd417b049901fcdc5a (patch) | |
| tree | f62fff8113faf169251d1e5250c91770571904a8 | |
| parent | 979f6fcebeeb420549e363f61eaae0b8fc6cd0fa (diff) | |
| parent | 23564a4a26eadd140740e3bc8b8b45cd3f8f62ab (diff) | |
| download | gsid-7a206aadd43ee6fb936781fd417b049901fcdc5a.tar.gz | |
Merge "Fix the callback status" into main am: 23564a4a26
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/2825812
Change-Id: I8c90c1bbc0343076b20eecd5f7ecdf9757a0cd27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | gsi_service.cpp | 7 |
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; } |