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

Commit a8280a5d authored by Neil Fuller's avatar Neil Fuller
Browse files

Fix receive timeout on LocalSocket 

The receive timeout stopped being set incorrect due to commit
c80af6d8. There is an associated CTS regression test in cts/.

Test: Ran CTS test android.net.cts.LocalSocketTest
Bug: 31205169
Change-Id: I99808478946f8eae502c49d2cb83465648b9c904
parent cff3f700

core/java/android/net/LocalSocketImpl.java

+4 −6
Original line number Diff line number Diff line
@@ -516,13 +516,11 @@ class LocalSocketImpl 
                    Os.setsockoptLinger(fd, OsConstants.SOL_SOCKET, OsConstants.SO_LINGER, linger);

                    break;

                case SocketOptions.SO_TIMEOUT:

                    /*

                     * SO_TIMEOUT from the core library gets converted to

                     * SO_SNDTIMEO, but the option is supposed to set both

                     * send and receive timeouts. Note: The incoming timeout

                     * value is in milliseconds.

                     */

                    // The option must set both send and receive timeouts.

                    // Note: The incoming timeout value is in milliseconds.

                    StructTimeval timeval = StructTimeval.fromMillis(intValue);

                    Os.setsockoptTimeval(fd, OsConstants.SOL_SOCKET, OsConstants.SO_RCVTIMEO,

                            timeval);

                    Os.setsockoptTimeval(fd, OsConstants.SOL_SOCKET, OsConstants.SO_SNDTIMEO,

                            timeval);

                    break;