am d453fe67: Merge change I5dbd1994 into eclair

Merge commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c' into eclair-mr2

* commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c':
  Fix rfcomm socket connect return code.

core/jni/android_bluetooth_HeadsetBase.cpp

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