commit 6787eb828800e0a0999db3c947e54818bbc1c101
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 05 23:29:24 2016
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 05 23:29:24 2016
tree ffb0bc5ad5c8d75748c6e544afa932cfb02daf17
parent f7432dc8225e7085dd194e7a5f99243c019e195b
parent e3bdbb2dd2e8498b9228d26b872088409a26e492

Merge "Return handle if an RFCOMM port is already open"

btif/src/btif_dm.cc

diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index b828b10..94261fe 100644
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -98,8 +98,6 @@
 #define BTIF_DM_INTERLEAVE_DURATION_LE_TWO    4
 #endif
 
-#define MAX_SDP_BL_ENTRIES 3
-
 #define ENCRYPTED_BREDR       2
 #define ENCRYPTED_LE          4
 
@@ -192,7 +190,6 @@
 
 #define BTA_SERVICE_ID_TO_SERVICE_MASK(id)       (1 << (id))
 
-#define MAX_SDP_BL_ENTRIES 3
 #define UUID_HUMAN_INTERFACE_DEVICE "00001124-0000-1000-8000-00805f9b34fb"
 
 #define MAX_BTIF_BOND_EVENT_ENTRIES 15
@@ -521,7 +518,7 @@
     }
     manufacturer = info.manufacturer;
 
-    for (int i = 0; i < MAX_SDP_BL_ENTRIES; i++)
+    for (unsigned int i = 0; i < ARRAY_SIZE(sdp_blacklist); i++)
     {
         if (manufacturer == sdp_blacklist[i].manufact_id)
             return TRUE;