From a01a4479a13d13f4abf773f24604124acb063c9f Mon Sep 17 00:00:00 2001
From: Jaikumar Ganesh <jaikumar@google.com>
Date: Thu, 1 Oct 2009 19:10:43 -0700
Subject: [PATCH] Fix rfcomm socket connect return code.

The phone would say connected even when powered off.
Bug id: 2161890
DrNo: Hiroshi

Change-Id: I5dbd19941a80e86c7462670fb844a29cf4eb0908
---
 core/jni/android_bluetooth_HeadsetBase.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/jni/android_bluetooth_HeadsetBase.cpp b/core/jni/android_bluetooth_HeadsetBase.cpp
index bad01869d3b34..71279b26263c4 100644
--- a/core/jni/android_bluetooth_HeadsetBase.cpp
+++ b/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. */