summaryrefslogtreecommitdiff
path: root/core/java/android/bluetooth/BluetoothSocket.java
diff options
context:
space:
mode:
authorfredc <fredc@broadcom.com>2012-04-25 17:46:13 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-16 21:25:05 -0700
commitd6883533e4ac3f73d2fde1db9a1dddf06dac6709 (patch)
tree97b2c1857ff7fd3467541958c2d3c61f4bbee671 /core/java/android/bluetooth/BluetoothSocket.java
parent903ac6f399dcd4f574bf388daa7b5f5907d448d3 (diff)
Fixed socket not closing on BT off. Used RemoteCallbackList to monitor binder deaths in BluetoothManagerService.
Change-Id: I524964bd2836d8c5a4bae095b93ac9481337941d
Diffstat (limited to 'core/java/android/bluetooth/BluetoothSocket.java')
-rw-r--r--core/java/android/bluetooth/BluetoothSocket.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java
index 221b1a3c8547..1bc640ff598b 100644
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -468,7 +468,7 @@ public final class BluetoothSocket implements Closeable {
int left = b.length;
while(left > 0) {
int ret = is.read(b, b.length - left, left);
- if(ret < 0)
+ if(ret <= 0)
throw new IOException("read failed, socket might closed, read ret: " + ret);
left -= ret;
if(left != 0)