Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I5dbd1994 into eclair

Browse Source 
* changes:
  Fix rfcomm socket connect return code.
This commit is contained in:
Android (Google) Code Review
2009-10-01 22:46:23 -04:00
parent 4ac45597fb a01a4479a1
commit d453fe6709
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_bluetooth_HeadsetBase.cpp
View File

@@ -396,7 +396,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj,
LOGE("select() on RFCOMM socket: %s (%d)", LOGE("select() on RFCOMM socket: %s (%d)",
strerror(errno), strerror(errno),
errno); errno);
return -1; return -errno;
} }
return 0; return 0;
} }
@@ -429,7 +429,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj,
fcntl(nat->rfcomm_sock, F_SETFL, nat->rfcomm_sock_flags); fcntl(nat->rfcomm_sock, F_SETFL, nat->rfcomm_sock_flags);
close(nat->rfcomm_sock); close(nat->rfcomm_sock);
nat->rfcomm_sock = -1; nat->rfcomm_sock = -1;
return -1; return -errno;
} }
} }
/* Restore the blocking properties of the socket. */ /* Restore the blocking properties of the socket. */