commit 726652e9d3f1adf6b68dedfa4618b490b7f1b4a3
author Matthew Xie <mattx@google.com> Wed Sep 03 10:04:00 2014 -0700
committer Andre Eisenbach <eisenbach@google.com> Wed Sep 03 19:25:39 2014 +0000
tree c400c10ccc89062e4ac8394721af38e4155e366c
parent a42c0de977fcd06e6c7a5be5b072fd661101ac58

Close the base socket when bindListen fails

Bug: 10773872
Change-Id: I0a72b2eb65055fa1959070d2dc32d40a573bd6f2

core/java/android/bluetooth/BluetoothSocket.java

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 @@
             } // 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;
         }