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

Commit 317fcdd8 authored by Yi Kong's avatar Yi Kong Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect use of TEMP_FAILURE_RETRY" am: 127616da am: ef016a5d am: 0798fffb 

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



Change-Id: I33c6975ee1048feeeade71f90d23c91b563b3157
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b71c0709 0798fffb

fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_server.cpp

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ bool SnapuserdServer::WaitForSocket() { 


    // We don't care if the ACK is received.

    code[0] = 'a';

    if (TEMP_FAILURE_RETRY(send(fd, code, sizeof(code), MSG_NOSIGNAL) < 0)) {

    if (TEMP_FAILURE_RETRY(send(fd, code, sizeof(code), MSG_NOSIGNAL)) < 0) {

        PLOG(ERROR) << "Failed to send ACK to proxy";

        return false;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ bool UserSnapshotServer::WaitForSocket() { 


    // We don't care if the ACK is received.

    code[0] = 'a';

    if (TEMP_FAILURE_RETRY(send(fd, code, sizeof(code), MSG_NOSIGNAL) < 0)) {

    if (TEMP_FAILURE_RETRY(send(fd, code, sizeof(code), MSG_NOSIGNAL)) < 0) {

        PLOG(ERROR) << "Failed to send ACK to proxy";

        return false;

    }