commit 6fadce76d56cebb4821856127cd89a2eada3d80a
author Wei Wang <weiwa@google.com> Thu Dec 04 21:47:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 04 21:47:37 2014 +0000
tree 1dcff60ca89f4c82388ea8b423ff421e89696c6b
parent 5faeaa8755679cef4d4aa529db813973b7f59380
parent e608a529718bb64accdf9f18cb196a9a3c45c90e

am e608a529: Merge "Remove unnecessary check of multiple advertise instance count." into lmp-mr1-dev

* commit 'e608a529718bb64accdf9f18cb196a9a3c45c90e':
  Remove unnecessary check of multiple advertise instance count.

btif/src/btif_gatt_multi_adv_util.c

diff --git a/btif/src/btif_gatt_multi_adv_util.c b/btif/src/btif_gatt_multi_adv_util.c
index e03f2f1..2a61cc8 100644
--- a/btif/src/btif_gatt_multi_adv_util.c
+++ b/btif/src/btif_gatt_multi_adv_util.c
@@ -52,13 +52,7 @@
         max_adv_inst = 1;
 
     BTIF_TRACE_DEBUG("%s, Count:%d", __FUNCTION__, max_adv_inst);
-    if(0 == BTM_BleMaxMultiAdvInstanceCount())
-    {
-        BTIF_TRACE_WARNING("BTM_BleMaxMultiAdvInstanceCount - No instances found");
-        return NULL;
-    }
 
-    BTIF_TRACE_DEBUG("BTM_BleMaxMultiAdvInstanceCount count:%d", BTM_BleMaxMultiAdvInstanceCount());
     if (NULL == p_multi_adv_com_data_cb)
     {
         p_multi_adv_com_data_cb = GKI_getbuf(sizeof(btgatt_multi_adv_common_data));