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

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

Merge "0->nullptr." am: 279589cb am: 88cf4b21 am: d905f07f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1700334

Change-Id: If357bddcc79e7060981a4d3e9f9e733f1af23826
parents 69cd4db5 d905f07f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ void RpcServer::join() {
    }

    while (true) {
        unique_fd clientFd(
                TEMP_FAILURE_RETRY(accept4(mServer.get(), nullptr, 0 /*length*/, SOCK_CLOEXEC)));
        unique_fd clientFd(TEMP_FAILURE_RETRY(
                accept4(mServer.get(), nullptr, nullptr /*length*/, SOCK_CLOEXEC)));

        if (clientFd < 0) {
            ALOGE("Could not accept4 socket: %s", strerror(errno));