summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSharvil Nanavati <sharvil@google.com>2014-05-07 06:52:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-07 06:52:41 +0000
commit73625a1d07876c1e431f4e79c845c7ca0ebfd4db (patch)
treee61a7d683ca06d2c2060ce4cee7b67e151c33e13 /core
parentcd2b93260d45e1363d82b93c89f73d45e41b7dc3 (diff)
parenta0ee00ec1354e86956dd2dabd6fdf3a9fecea73f (diff)
downloadframeworks_base-73625a1d07876c1e431f4e79c845c7ca0ebfd4db.zip
frameworks_base-73625a1d07876c1e431f4e79c845c7ca0ebfd4db.tar.gz
frameworks_base-73625a1d07876c1e431f4e79c845c7ca0ebfd4db.tar.bz2
am f6c78e59: Merge "Make sure BluetoothSocket#connect throws on error."
* commit 'f6c78e590cf44defea2bcdea593485e958988962': Make sure BluetoothSocket#connect throws on error.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/bluetooth/BluetoothSocket.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java
index f532f7c..00fd7ce 100644
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -325,6 +325,7 @@ public final class BluetoothSocket implements Closeable {
}
} catch (RemoteException e) {
Log.e(TAG, Log.getStackTraceString(new Throwable()));
+ throw new IOException("unable to send RPC: " + e.getMessage());
}
}