commit 811954bd11b3597267eacfbb9c64fa35aa1d57a0
author android-build-team Robot <android-build-team-robot@google.com> Thu Oct 03 19:09:01 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Oct 03 19:09:01 2019 +0000
tree 42d23546d26704e1341c67f609edf09fff289cb8
parent 7b71ff547ace8007057db71b59fc3fc3ee435b87
parent 90076d7db805fd0299d23ff9b457ae7d1603f480

Merge cherrypicks of [9498126, 9498166, 9498147, 9498167] into sparse-5916148-L86100000373241811

Change-Id: Ie7896037d595b46cae1c24046f71d6818b6edc5d

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;
+      }
     }
   }