commit fc027b44bceda01fc4cfb1d63d19787a095d915c
author android-build-team Robot <android-build-team-robot@google.com> Fri Apr 21 17:31:09 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Apr 21 17:31:09 2017 +0000
tree b61df87fb03e135bf569f730d0f058416acf1dc2
parent f3eaa03663c54da7d65379d99d5ecf60e3443ea1
parent 74a7a015ffaa17aa6dc2cc677500e8e5fa0daeb2

release-request-762540b1-1728-41bc-a9ce-e977f3e2683f-for-git_nyc-mr2-pixel-monthly-release-3888830 snap-temp-L22300000056915770

Change-Id: I6bcb0d7906f30abb7a42947d5f93b12a335a3e82

stack/btm/btm_ble_gap.c

diff --git a/stack/btm/btm_ble_gap.c b/stack/btm/btm_ble_gap.c
index 7fe3c99..286787e 100644
--- a/stack/btm/btm_ble_gap.c
+++ b/stack/btm/btm_ble_gap.c
@@ -28,8 +28,6 @@
 #include <stdio.h>
 #include <stddef.h>
 
-#include <log/log.h>
-
 #include "bt_types.h"
 #include "bt_utils.h"
 #include "btm_ble_api.h"
@@ -2287,7 +2285,7 @@
 ** Returns          void
 **
 *******************************************************************************/
-BOOLEAN btm_ble_cache_adv_data(tBTM_INQ_RESULTS *p_cur, UINT8 data_len, UINT8 *p, UINT8 evt_type)
+void btm_ble_cache_adv_data(tBTM_INQ_RESULTS *p_cur, UINT8 data_len, UINT8 *p, UINT8 evt_type)
 {
     tBTM_BLE_INQ_CB     *p_le_inq_cb = &btm_cb.ble_ctr_cb.inq_var;
     UINT8 *p_cache;
@@ -2307,16 +2305,8 @@
         STREAM_TO_UINT8(length, p);
         while ( length && ((p_le_inq_cb->adv_len + length + 1) <= BTM_BLE_CACHE_ADV_DATA_MAX))
         {
-            /* adv record size must be smaller than the total adv data size */
-            if ((length + 1) > data_len) {
-                BTM_TRACE_ERROR("BTM - got incorrect LE advertising data");
-                android_errorWriteLog(0x534e4554, "33899337");
-                return FALSE;
-            }
             /* copy from the length byte & data into cache */
             memcpy(p_cache, p-1, length+1);
-            /* reduce the total data size by size of data copied */
-            data_len -= length + 1;
             /* advance the cache pointer past data */
             p_cache += length+1;
             /* increment cache length */
@@ -2326,7 +2316,6 @@
             STREAM_TO_UINT8(length, p);
         }
     }
-    return TRUE;
 
     /* parse service UUID from adv packet and save it in inq db eir_uuid */
     /* TODO */
@@ -2551,9 +2540,7 @@
         BTM_TRACE_WARNING("EIR data too long %d. discard", data_len);
         return FALSE;
     }
-    if (!btm_ble_cache_adv_data(p_cur, data_len, p, evt_type)) {
-        return FALSE;
-    }
+    btm_ble_cache_adv_data(p_cur, data_len, p, evt_type);
 
     p1 = (p + data_len);
     STREAM_TO_UINT8 (rssi, p1);