commit 183d931fb31509a4a108f2577f70dab75998cf65
author Sungki Kim <skkim7@gmail.com> Thu May 19 10:18:07 2016 -0700
committer Andre Eisenbach <eisenbach@google.com> Thu May 19 18:25:25 2016 +0000
tree 904dd8a13dc100318d915a229297a812cec38d29
parent 8eaabdf8a1ff6bed1a7633b22619af15adfd9272

Fix GATT autoConnect race condition

As pointed out here:
https://code.google.com/p/android/issues/detail?id=69834

registerApp() causes onClientRegistered() to happen before autoConnect
is set. This patch fixes that.

Bug: 28861330
Change-Id: Ie1174c0f224f5084178439420b383164d22d542c

framework/java/android/bluetooth/BluetoothGatt.java

diff --git a/framework/java/android/bluetooth/BluetoothGatt.java b/framework/java/android/bluetooth/BluetoothGatt.java
index b8a40dc..800dd43 100644
--- a/framework/java/android/bluetooth/BluetoothGatt.java
+++ b/framework/java/android/bluetooth/BluetoothGatt.java
@@ -645,6 +645,9 @@
             }
             mConnState = CONN_STATE_CONNECTING;
         }
+
+        mAutoConnect = autoConnect;
+
         if (!registerApp(callback)) {
             synchronized(mStateLock) {
                 mConnState = CONN_STATE_IDLE;
@@ -653,8 +656,7 @@
             return false;
         }
 
-        // the connection will continue after successful callback registration
-        mAutoConnect = autoConnect;
+        // The connection will continue in the onClientRegistered callback
         return true;
     }