Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89f9175f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [9517683, 9518093] into qt-qpr1-release

Change-Id: I6b499c993dd92f8b587a21dedf37b17eb54ffee9
parents 125cecee 8f326f6e
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -1108,10 +1108,12 @@ 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);
      }
      if (status != BTM_DEV_BLACKLISTED) {
        is_ok = false;
        p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;
      }
    }
  }

  return is_ok;
}