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

Commit d453fe67 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I5dbd1994 into eclair

* changes:
  Fix rfcomm socket connect return code.
parents 4ac45597 a01a4479
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj,
                LOGE("select() on RFCOMM socket: %s (%d)",
                     strerror(errno),
                     errno);
                return -1;
                return -errno;
            }
            return 0;
        }
@@ -429,7 +429,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj,
                    fcntl(nat->rfcomm_sock, F_SETFL, nat->rfcomm_sock_flags);
                    close(nat->rfcomm_sock);
                    nat->rfcomm_sock = -1;
                    return -1;
                    return -errno;
                }
            }
            /* Restore the blocking properties of the socket. */