Merge "libsnapuserd: Handle error message" into main am: 2c45fa7df7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3525131
Change-Id: Id58b2cda0adc52368f87eb5b67752320ec418510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp b/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
index d0ff7f7..693fe39 100644
--- a/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
@@ -395,7 +395,8 @@
LOG(ERROR) << "Failed to pause snapshot merge.";
return false;
}
- return true;
+ std::string response = Receivemsg();
+ return response == "success";
}
bool SnapuserdClient::ResumeMerge() {
@@ -403,7 +404,8 @@
LOG(ERROR) << "Failed to resume snapshot merge.";
return false;
}
- return true;
+ std::string response = Receivemsg();
+ return response == "success";
}
} // namespace snapshot
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp
index a2813bf..372b2f2 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp
@@ -229,10 +229,10 @@
return Sendmsg(fd, "success");
} else if (cmd == "pause_merge") {
handlers_->PauseMerge();
- return true;
+ return Sendmsg(fd, "success");
} else if (cmd == "resume_merge") {
handlers_->ResumeMerge();
- return true;
+ return Sendmsg(fd, "success");
} else {
LOG(ERROR) << "Received unknown message type from client";
Sendmsg(fd, "fail");