コミット: 1095bf35c437306d42987be344d67da29cb82dcd - system-bt (git)

system/bt

コミットメタ情報

• リビジョン: 1095bf35c437306d42987be344d67da29cb82dcd (tree)
• 日時: 2019-05-30 16:00:51
• 作者: weichinweng <weichinweng@goog...>
• コミッター: android-build-merger

ログメッセージ

Merge "Open connection if it doesn't exsist in bta_gattc_process_indicate" into qt-dev
am: 8c3e9415af

Change-Id: I7bc7abd759f0ef495a592998f205da7a720d732f

変更サマリ

• modified: bta/gatt/bta_gattc_act.cc

差分

--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -1240,6 +1240,20 @@ void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op,
   }
 
   tBTA_GATTC_CLCB* p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);
+  /* connection not open yet */
+  if (p_clcb == NULL) {
+    p_clcb = bta_gattc_clcb_alloc(gatt_if, remote_bda, transport);
+
+    if (p_clcb == NULL) {
+      LOG(ERROR) << __func__ << ": No resources";
+      return;
+    }
+
+    p_clcb->bta_conn_id = conn_id;
+    p_clcb->transport = transport;
+
+    bta_gattc_sm_execute(p_clcb, BTA_GATTC_INT_CONN_EVT, NULL);
+  }
 
   notify.handle = handle;
 
@@ -1250,21 +1264,6 @@ void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op,
 
   /* if app registered for the notification */
   if (bta_gattc_check_notif_registry(p_clrcb, p_srcb, &notify)) {
-    /* connection not open yet */
-    if (p_clcb == NULL) {
-      p_clcb = bta_gattc_clcb_alloc(gatt_if, remote_bda, transport);
-
-      if (p_clcb == NULL) {
-        LOG(ERROR) << "No resources";
-        return;
-      }
-
-      p_clcb->bta_conn_id = conn_id;
-      p_clcb->transport = transport;
-
-      bta_gattc_sm_execute(p_clcb, BTA_GATTC_INT_CONN_EVT, NULL);
-    }
-
     if (p_clcb != NULL)
       bta_gattc_proc_other_indication(p_clcb, op, p_data, &notify);
   }