Merge "libsnapuserd: Handle error message" into main (2c45fa7d) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -395,7 +395,8 @@ bool SnapuserdClient::PauseMerge() {
		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 @@ bool SnapuserdClient::ResumeMerge() {
		LOG(ERROR) << "Failed to resume snapshot merge.";
		return false;
		}
		return true;
		std::string response = Receivemsg();
		return response == "success";
		}

		} // namespace snapshot

+2 −2

Original line number	Diff line number	Diff line
		@@ -229,10 +229,10 @@ bool UserSnapshotServer::Receivemsg(android::base::borrowed_fd fd, const std::st
		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");