commit a0c6611f9e8e17d258a9d6cf7c55bccf40be45b8
author Jakub Pawlowski <jpawlowski@google.com> Thu May 05 10:09:44 2016 -0700
committer Jakub Pawlowski <jpawlowski@google.com> Wed May 11 17:29:12 2016 -0700
tree 94e9553f18d48e0f3e905d1ffcd22b9535da4f88
parent cf7ffe4c8f2b1b264e196d2c69c4fac693652f2e

Rewrite btif_gatts_send_indication to new style

Bug: 28485365
Change-Id: I1d3221be272e53245e09077dad9d291829350b45

system/btif/src/btif_gatt_server.cc

diff --git a/system/btif/src/btif_gatt_server.cc b/system/btif/src/btif_gatt_server.cc
index 3d9afea..efde755 100644
--- a/system/btif/src/btif_gatt_server.cc
+++ b/system/btif/src/btif_gatt_server.cc
@@ -78,8 +78,7 @@
     BTIF_GATTS_ADD_DESCRIPTOR,
     BTIF_GATTS_START_SERVICE,
     BTIF_GATTS_STOP_SERVICE,
-    BTIF_GATTS_DELETE_SERVICE,
-    BTIF_GATTS_SEND_INDICATION
+    BTIF_GATTS_DELETE_SERVICE
 } btif_gatts_event_t;
 
 /************************************************************************************
@@ -492,13 +491,6 @@
             BTA_GATTS_DeleteService(p_cb->srvc_handle);
             break;
 
-        case BTIF_GATTS_SEND_INDICATION:
-            BTA_GATTS_HandleValueIndication(p_cb->conn_id, p_cb->attr_handle,
-                                        p_cb->len, p_cb->value, p_cb->confirm);
-            // TODO: Might need to send an ACK if handle value indication is
-            //       invoked without need for confirmation.
-            break;
-
         default:
             LOG_ERROR(LOG_TAG, "%s: Unknown event (%d)!", __FUNCTION__, event);
             break;
@@ -634,19 +626,20 @@
                                  (char*) &btif_cb, sizeof(btif_gatts_cb_t), NULL);
 }
 
-static bt_status_t btif_gatts_send_indication(int server_if, int attribute_handle, int conn_id,
-                                              int len, int confirm, char* p_value)
-{
-    CHECK_BTGATT_INIT();
-    btif_gatts_cb_t btif_cb;
-    btif_cb.server_if = (uint8_t) server_if;
-    btif_cb.conn_id = (uint16_t) conn_id;
-    btif_cb.attr_handle = attribute_handle;
-    btif_cb.confirm = confirm;
-    btif_cb.len = len;
-    memcpy(btif_cb.value, p_value, len > BTGATT_MAX_ATTR_LEN ? BTGATT_MAX_ATTR_LEN : len);
-    return btif_transfer_context(btgatts_handle_event, BTIF_GATTS_SEND_INDICATION,
-                                 (char*) &btif_cb, sizeof(btif_gatts_cb_t), NULL);
+static bt_status_t btif_gatts_send_indication(int server_if,
+                                              int attribute_handle, int conn_id,
+                                              int len, int confirm,
+                                              char *p_value) {
+  CHECK_BTGATT_INIT();
+
+  len = len > BTGATT_MAX_ATTR_LEN ? BTGATT_MAX_ATTR_LEN : len;
+  uint8_t *value = new uint8_t[len];
+  memcpy(value, p_value, len);
+
+  return do_in_jni_thread(Bind(&BTA_GATTS_HandleValueIndication, conn_id,
+                               attribute_handle, len, base::Owned(value), confirm));
+  // TODO: Might need to send an ACK if handle value indication is
+  //       invoked without need for confirmation.
 }
 
 static void btif_gatts_send_response_impl(int conn_id, int trans_id, int status,