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

Commit bf0fbcda authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Gerrit Code Review
Browse files

Merge "Fix GATT autoConnect race condition"

parents 9fd5a790 1945dd97

framework/java/android/bluetooth/BluetoothGatt.java

+4 −2
Original line number Diff line number Diff line
@@ -645,6 +645,9 @@ public final class BluetoothGatt implements BluetoothProfile { 
            }

            mConnState = CONN_STATE_CONNECTING;

        }



        mAutoConnect = autoConnect;



        if (!registerApp(callback)) {

            synchronized(mStateLock) {

                mConnState = CONN_STATE_IDLE;
@@ -653,8 +656,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
            return false;

        }



        // the connection will continue after successful callback registration

        mAutoConnect = autoConnect;

        // The connection will continue in the onClientRegistered callback

        return true;

    }