diff options
| author | Zhihai Xu <zhihaixu@google.com> | 2013-07-24 15:09:45 -0700 |
|---|---|---|
| committer | Zhihai Xu <zhihaixu@google.com> | 2013-07-24 15:09:45 -0700 |
| commit | df3cedab6fce59ce1dde4316bf63df7f7e488e23 (patch) | |
| tree | f07acb272977d41ee22a07b4471c3dac227515d5 /core/java/android/bluetooth | |
| parent | 616dfe37f5a1f67f97d151f0fbefa4020ddfdec6 (diff) | |
| download | frameworks_base-df3cedab6fce59ce1dde4316bf63df7f7e488e23.zip frameworks_base-df3cedab6fce59ce1dde4316bf63df7f7e488e23.tar.gz frameworks_base-df3cedab6fce59ce1dde4316bf63df7f7e488e23.tar.bz2 | |
Bluetooth stopped working in master - "bad file descriptor"
ignore IllegalArgumentException in BluetoothSocket.close().
bug: 9960585
Change-Id: I301aa388b738dcb92b643fdd96b5c9cb6f8b3efe
Diffstat (limited to 'core/java/android/bluetooth')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothSocket.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index d10eaea..5c534a1 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java @@ -461,8 +461,13 @@ public final class BluetoothSocket implements Closeable { mSocket.close(); mSocket = null; } - if(mPfd != null) - mPfd.detachFd(); + if(mPfd != null) { + try { + mPfd.detachFd(); + } catch (IllegalArgumentException e) { + Log.w(TAG, "ignore IllegalArgumentException"); + } + } } } } |