Merge "Avoid calling BluetoothSocket.destroyNative twice" into ics-aah

2012-05-07 09:12:00 -07:00
parent b89ce43499 34b2feb041
commit 1903a73248
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -242,8 +242,10 @@ public final class BluetoothSocket implements Closeable {
        // abortNative(), so this lock should immediately acquire
        mLock.writeLock().lock();
        try {
-            mSocketState = SocketState.CLOSED;
-            destroyNative();
+            if (mSocketState != SocketState.CLOSED) {
+                mSocketState = SocketState.CLOSED;
+                destroyNative();
+            }
        } finally {
            mLock.writeLock().unlock();
        }