summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2011-08-19 10:31:20 +0200
committerMartijn Coenen <maco@google.com>2011-08-19 10:31:20 +0200
commit3714e3430e3f44578d7799d163809ad0a77f7460 (patch)
tree1f144760581c8f88c2adf1a8e832a610440cf2c9 /jni
parentb2112cff553c3b6658440bf06060c7a08f82df5c (diff)
downloadpackages_apps_nfc-3714e3430e3f44578d7799d163809ad0a77f7460.zip
packages_apps_nfc-3714e3430e3f44578d7799d163809ad0a77f7460.tar.gz
packages_apps_nfc-3714e3430e3f44578d7799d163809ad0a77f7460.tar.bz2
Fix GB<->ICS sharing.
Should throw an IOException() whenever recv() failed. Also changed recv error return value to be -1, to be more in line with common sockets. Change-Id: If65fe9e22c76f0a4558a9a6dedc0662bac038ee8
Diffstat (limited to 'jni')
-rw-r--r--jni/com_android_nfc_NativeLlcpSocket.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/com_android_nfc_NativeLlcpSocket.cpp b/jni/com_android_nfc_NativeLlcpSocket.cpp
index b2784f6..8ad281a 100644
--- a/jni/com_android_nfc_NativeLlcpSocket.cpp
+++ b/jni/com_android_nfc_NativeLlcpSocket.cpp
@@ -311,7 +311,7 @@ static jint com_android_nfc_NativeLlcpSocket_doReceive(JNIEnv *e, jobject o, jby
phLibNfc_Handle hLlcpSocket;
phNfc_sData_t sReceiveBuffer = {NULL, 0};
struct nfc_jni_callback_data cb_data;
- jint result = 0;
+ jint result = -1;
/* Retrieve handles */
hRemoteDevice = nfc_jni_get_p2p_device_handle(e,o);