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

Commit f2b80d8c authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am d453fe67: Merge change I5dbd1994 into eclair 

Merge commit 'd453fe67' into eclair-mr2

* commit 'd453fe67':
  Fix rfcomm socket connect return code.
parents c5b09d8a d453fe67

core/jni/android_bluetooth_HeadsetBase.cpp

+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. */