diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-08 05:10:46 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-08 05:10:46 +0000 |
| commit | e91e15eb5b2c5f8b4ef61b7e363493b8b3e27cad (patch) | |
| tree | e9244f26dff4da3cb31c1359e6020b553cccc6a9 | |
| parent | ff36b94b19cbe84c0798a48a295b30fbe79a481b (diff) | |
| parent | d7adb87fd0c807cdeac1f15a99f165b8830efbd6 (diff) | |
| download | android_system_bt-e91e15eb5b2c5f8b4ef61b7e363493b8b3e27cad.tar.gz android_system_bt-e91e15eb5b2c5f8b4ef61b7e363493b8b3e27cad.tar.bz2 android_system_bt-e91e15eb5b2c5f8b4ef61b7e363493b8b3e27cad.zip | |
Merge cherrypicks of [9517683, 9518093] into qt-qpr1-release
Change-Id: I6b499c993dd92f8b587a21dedf37b17eb54ffee9
| -rw-r--r-- | bta/av/bta_av_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bta/av/bta_av_main.cc b/bta/av/bta_av_main.cc index 34516fcdd..bdd8a70fa 100644 --- a/bta/av/bta_av_main.cc +++ b/bta/av/bta_av_main.cc @@ -1108,8 +1108,10 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { "%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; + } } } |