summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-09-21 21:55:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-21 21:55:46 +0000
commit438cc52ca1e3c8835967e4e7281bad4c3e251eab (patch)
tree333780a7c49463032ef78aeaef751362883acfee /core/java/android
parent3d995d6f5fe9fd0c6cc74e75e618b9cdf8096dfb (diff)
parent8fd324c33fcc6651bacfb5d4f311207c3353d406 (diff)
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1
am: 8fd324c33f Change-Id: Idbe61150d738e5e41d5606fa6d89c0a5b604a86d
Diffstat (limited to 'core/java/android')
-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 5738b9a6fb28..c9f19809762d 100644
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -196,6 +196,7 @@ public final class BluetoothSocket implements Closeable {
as.close();
throw new IOException("bt socket acept failed");
}
+ as.mPfd = new ParcelFileDescriptor(fds[0]);
as.mSocket = new LocalSocket(fds[0]);
as.mSocketIS = as.mSocket.getInputStream();
as.mSocketOS = as.mSocket.getOutputStream();