Merge "Fix GATT autoConnect race condition" into nyc-dev

2016-05-19 19:38:55 +00:00
parent 9d37bdcb91 d35167adca
commit ddd7d3d766
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/bluetooth/BluetoothGatt.java
+++ b/core/java/android/bluetooth/BluetoothGatt.java
@@ -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;
    }