commit c66e70b61466e33f9ac898d5330552bb729cf5ea
author android-build-team Robot <android-build-team-robot@google.com> Mon Oct 07 22:46:46 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Oct 07 22:46:46 2019 +0000
tree 42d23546d26704e1341c67f609edf09fff289cb8
parent 7b71ff547ace8007057db71b59fc3fc3ee435b87
parent 66eaff292dc1ef378f68d46b36842f0aac06c9c2

Merge cherrypicks of [9514600, 9517315, 9517610, 9517666] into sparse-5908172-L30000000374561275

Change-Id: Ib452860b94258dd57b631af4c3b2846eaff8ef91

bta/av/bta_av_main.cc

diff --git a/bta/av/bta_av_main.cc b/bta/av/bta_av_main.cc
index 34516fc..bdd8a70 100644
--- a/bta/av/bta_av_main.cc
+++ b/bta/av/bta_av_main.cc
@@ -1108,8 +1108,10 @@
                   "%s: peer %s BTM_SwitchRole(BTM_ROLE_MASTER) error: %d",
                   __func__, p_scb->PeerAddress().ToString().c_str(), status);
       }
-      is_ok = false;
-      p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;
+      if (status != BTM_DEV_BLACKLISTED) {
+        is_ok = false;
+        p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;
+      }
     }
   }