diff options
| author | Zhihai Xu <zhihaixu@google.com> | 2014-01-20 12:04:23 -0800 |
|---|---|---|
| committer | Zhihai Xu <zhihaixu@google.com> | 2014-01-20 17:43:37 -0800 |
| commit | 0ad591620a446d857fbae445b5c0badf3d366c4e (patch) | |
| tree | df9b45844881aee290630fb2bac411d6e9f2b257 /framework/java/android/bluetooth/BluetoothSocket.java | |
| parent | 6a467db2f954a29a5f26207b33957dd6aac13c87 (diff) | |
bluetoothsocket fd leak, need close the file descriptor after detachFd.
Perform ParcelFileDescriptor close after detach to avoid bluetooth
socket leaks in strict mode.
bug:12647433
Change-Id: I22f422547b2fb33b9bf12065dc689ed7785a7269
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothSocket.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothSocket.java b/framework/java/android/bluetooth/BluetoothSocket.java index 22322e338e..f532f7ce30 100644 --- a/framework/java/android/bluetooth/BluetoothSocket.java +++ b/framework/java/android/bluetooth/BluetoothSocket.java @@ -457,8 +457,10 @@ public final class BluetoothSocket implements Closeable { mSocket.close(); mSocket = null; } - if(mPfd != null) - mPfd.detachFd(); + if (mPfd != null) { + mPfd.close(); + mPfd = null; + } } } } |