Merge "Fix GATT autoConnect race condition"

am: 53ccfe848f

* commit '53ccfe848f1b97cca12c7e5b496032e97594a8e2':
  Fix GATT autoConnect race condition

Change-Id: Ia761a72b003751146b83314facfdaf936b1f9e9b

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;
     }