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

Commit 3e96f9f4 authored Apr 13, 2023 by Treehugger Robot Committed by Gerrit Code Review Apr 13, 2023

Merge "Remove `and` digraph to use `&&`"

parents 2fa75e13 d8ca39aa

system/gd/l2cap/internal/enhanced_retransmission_mode_channel_data_controller.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -280,14 +280,14 @@ struct ErtmController::impl {
		send_pending_i_frames();
		} else if (p == Poll::NOT_SET && f == Final::NOT_SET && with_valid_req_seq(req_seq) && with_valid_f_bit(f)) {
		pass_to_tx(req_seq, f);
		if (remote_busy() and unacked_frames_ > 0) {
		if (remote_busy() && unacked_frames_ > 0) {
		start_retrans_timer();
		}
		remote_busy_ = false;
		send_ack(Final::NOT_SET);
		} else if (p == Poll::POLL && with_valid_req_seq(req_seq) && with_valid_f_bit(f)) {
		pass_to_tx(req_seq, f);
		if (remote_busy() and unacked_frames_ > 0) {
		if (remote_busy() && unacked_frames_ > 0) {
		start_retrans_timer();
		}
		remote_busy_ = false;

system/profile/avrcp/connection_handler.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -428,7 +428,7 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb,
		uint16_t status) {
		VLOG(1) << __PRETTY_FUNCTION__ << ": SDP lookup callback received";

		if (status == SDP_CONN_FAILED and !retry) {
		if (status == SDP_CONN_FAILED && !retry) {
		LOG(WARNING) << __PRETTY_FUNCTION__ << ": SDP Failure retry again";
		SdpLookup(bdaddr, cb, true);
		return;