Merge "Close the base socket when bindListen fails" into lmp-dev

2014-09-03 19:29:02 +00:00
parent 1f0ce33821 726652e9d3
commit ddfa8e18fd
1 changed files with 8 additions and 0 deletions
--- 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;
        }