Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a535107 authored by Jason Simmons's avatar Jason Simmons Committed by Android Git Automerger
Browse files

am 1903a732: Merge "Avoid calling BluetoothSocket.destroyNative twice" into ics-aah 

* commit '1903a732':
  Avoid calling BluetoothSocket.destroyNative twice
parents 747d8d27 1903a732

core/java/android/bluetooth/BluetoothSocket.java

+4 −2
Original line number Diff line number Diff line
@@ -242,8 +242,10 @@ public final class BluetoothSocket implements Closeable { 
        // abortNative(), so this lock should immediately acquire

        mLock.writeLock().lock();

        try {

            if (mSocketState != SocketState.CLOSED) {

                mSocketState = SocketState.CLOSED;

                destroyNative();

            }

        } finally {

            mLock.writeLock().unlock();

        }