From: Andre Eisenbach <eisenbach@google.com>
Date: Fri, 22 May 2015 23:38:54 +0000 (-0700)
Subject: Fix problem where multi-adv instances cannot be re-used
X-Git-Tag: android-x86-7.1-r1~394^2~216^2~122
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c09540f7f5dc712fda7e2179602514c0738092b6;p=android-x86%2Fsystem-bt.git

Fix problem where multi-adv instances cannot be re-used

After using all multi-adv instances and stopping them, the instance ID
for each instance is incorrectly reset, causing the instance to be not
usable anymore.

Bug: 21404808
Change-Id: Ie3a3f07bc2204c7268567cb56248cd3eb7751742
---

diff --git a/stack/btm/btm_ble_multi_adv.c b/stack/btm/btm_ble_multi_adv.c
index dfd31e38c..6ee3e94cf 100644
--- a/stack/btm/btm_ble_multi_adv.c
+++ b/stack/btm/btm_ble_multi_adv.c
@@ -740,7 +740,7 @@ tBTM_STATUS BTM_BleDisableAdvInstance (UINT8 inst_id)
          {
             btm_ble_multi_adv_configure_rpa(&btm_multi_adv_cb.p_adv_inst[inst_id-1]);
             btu_stop_timer_oneshot(&btm_multi_adv_cb.p_adv_inst[inst_id-1].raddr_timer_ent);
-            btm_multi_adv_cb.p_adv_inst[inst_id-1].inst_id = 0;
+            btm_multi_adv_cb.p_adv_inst[inst_id-1].in_use = FALSE;
          }
      }
     return rt;