Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1a8d34f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libsnapuserd: Handle error message" into main am: 2c45fa7d 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3525131



Change-Id: Id58b2cda0adc52368f87eb5b67752320ec418510
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 898beb21 2c45fa7d

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

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp

+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");