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

Author: jason-simmons

core/java/android/bluetooth/BluetoothSocket.java

@@ -242,8 +242,10 @@ public void close() throws IOException {
         // 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();
         }