Call btm_ble_set_conn_st before on_connection_complete am: 7fd3b7f3 am: f56c5214

am: 33774dda

Change-Id: I7cdf9fa0b435c35f74f3fbadde1bbd0b814d145b

system/stack/btm/btm_ble.cc

@@ -1958,6 +1958,10 @@ void btm_ble_conn_complete(uint8_t* p, UNUSED_ATTR uint16_t evt_len,
     }
 #endif
 
+    if (role == HCI_ROLE_MASTER) {
+      btm_ble_set_conn_st(BLE_CONN_IDLE);
+    }
+
     gatt::connection_manager::on_connection_complete(bda);
     btm_ble_connected(bda, handle, HCI_ENCRYPT_MODE_DISABLED, role, bda_type,
                       match);

system/stack/l2cap/l2c_ble.cc

@@ -285,7 +285,6 @@ void l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda,
       __func__, handle, type, conn_interval, conn_latency, conn_timeout);
 
   if (role == HCI_ROLE_MASTER) {
-    btm_ble_set_conn_st(BLE_CONN_IDLE);
     l2cb.is_ble_connecting = false;
   }