Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-19 19:38:55 +00:00
committed by Android (Google) Code Review
parent 9d37bdcb91 d35167adca
commit ddd7d3d766
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/bluetooth/BluetoothGatt.java
View File

@@ -645,6 +645,9 @@ public final class BluetoothGatt implements BluetoothProfile {
} }
mConnState = CONN_STATE_CONNECTING; mConnState = CONN_STATE_CONNECTING;
} }
mAutoConnect = autoConnect;
if (!registerApp(callback)) { if (!registerApp(callback)) {
synchronized(mStateLock) { synchronized(mStateLock) {
mConnState = CONN_STATE_IDLE; mConnState = CONN_STATE_IDLE;
@@ -653,8 +656,7 @@ public final class BluetoothGatt implements BluetoothProfile {
return false; return false;
} }
// the connection will continue after successful callback registration // The connection will continue in the onClientRegistered callback
mAutoConnect = autoConnect;
return true; return true;
} }