Commit: e05ea5ed112343badf5bd3d5632214b74527eb4d - system-bt (git)

system/bt

Commit MetaInfo

• Revision: e05ea5ed112343badf5bd3d5632214b74527eb4d (tree)
• Zeit: 2019-06-12 07:01:23
• Autor: Jakub Pawlowski <jpawlowski@goog...>
• Commiter: android-build-merger

Log Message

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"
am: 1ae89b7db2

Change-Id: I7dd5e73de79498e378d24140a3ff4790a4138dac

Ändern Zusammenfassung

• modified: bta/gatt/bta_gattc_act.cc

Diff

--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -1240,20 +1240,6 @@ 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;
 
@@ -1264,6 +1250,21 @@ 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);
   }