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

Commit 444b260d authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge changes I6266c445,I0d9e9296

am: 94424cc6

Change-Id: Iaf1fba9197bebb1420a1e63d85f5cd88a49c3b23
parents 6ad966f5 94424cc6
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -1114,10 +1114,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_MODE_UNSUPPORTED && status != BTM_DEV_BLACKLISTED) {
        is_ok = false;
        p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START;
      }
    }
  }

  return is_ok;
}