From 726652e9d3f1adf6b68dedfa4618b490b7f1b4a3 Mon Sep 17 00:00:00 2001
From: Matthew Xie <mattx@google.com>
Date: Wed, 3 Sep 2014 10:04:00 -0700
Subject: Close the base socket when bindListen fails

Bug: 10773872
Change-Id: I0a72b2eb65055fa1959070d2dc32d40a573bd6f2
---
 core/java/android/bluetooth/BluetoothSocket.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java
index b98e5ae..36997e5 100644
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -375,6 +375,14 @@ public final class BluetoothSocket implements Closeable {
             } // else ASSERT(mPort == channel)
             ret = 0;
         } catch (IOException e) {
+            if (mPfd != null) {
+                try {
+                    mPfd.close();
+                } catch (IOException e1) {
+                    Log.e(TAG, "bindListen, close mPfd: " + e1);
+                }
+                mPfd = null;
+            }
             Log.e(TAG, "bindListen, fail to get port number, exception: " + e);
             return -1;
         }
-- 
cgit v1.1