commit e31d417196a377d6718cbccd54794097e095d0b1
author tturney <tturney@google.com> Mon Sep 21 10:49:09 2015 -0700
committer tturney <tturney@google.com> Mon Sep 21 11:52:10 2015 -0700
tree e5be329239a430bd8e8aafbc91b27ea54785134e
parent 1cf812f61823c981406f18b2577f43b69e80253d

Fix PAN and AV role switch war

Bug: 23740164
Change-Id: Ib26a64b624c711443201adc4fde6b041ecb0dde1

bta/dm/bta_dm_act.c

diff --git a/bta/dm/bta_dm_act.c b/bta/dm/bta_dm_act.c
index eb49637..5230d8f 100644
--- a/bta/dm/bta_dm_act.c
+++ b/bta/dm/bta_dm_act.c
@@ -3689,7 +3689,8 @@
                   versions are stored in a blacklist and role switch with these devices are
                   delayed to avoid the collision with link encryption setup */
 
-                    if (delay_role_switch == FALSE)
+                    if (bta_dm_cb.device_list.peer_device[i].pref_role != BTA_SLAVE_ROLE_ONLY &&
+                            delay_role_switch == FALSE)
                     {
                         BTM_SwitchRole (bta_dm_cb.device_list.peer_device[i].peer_bdaddr,
                                         HCI_ROLE_MASTER, NULL);