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

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

Snap for 7280565 from 6158a0ab to sc-release 

Change-Id: Ib52a053c80f8fbbfac66afcfe4d2145943ee3468
parents c7ad7c50 6158a0ab

system/btif/src/btif_av.cc

+1 −1
Original line number Diff line number Diff line
@@ -3390,7 +3390,7 @@ static void btif_debug_av_peer_dump(int fd, const BtifAvPeer& peer) { 
  dprintf(fd, "    Support 3Mbps: %s\n", peer.Is3Mbps() ? "true" : "false");

  dprintf(fd, "    Self Initiated Connection: %s\n",

          peer.SelfInitiatedConnection() ? "true" : "false");

  dprintf(fd, "    Delay Reporting: %u\n", peer.GetDelayReport());

  dprintf(fd, "    Delay Reporting: %u (in 1/10 milliseconds) \n", peer.GetDelayReport());

  dprintf(fd, "    Codec Preferred: %s\n",

          peer.IsMandatoryCodecPreferred() ? "Mandatory" : "Optional");

}

system/btif/src/btif_hh.cc

+5 −1
Original line number Diff line number Diff line
@@ -1242,9 +1242,13 @@ static bt_status_t connect(RawAddress* bd_addr) { 
    btif_transfer_context(btif_hh_handle_evt, BTIF_HH_CONNECT_REQ_EVT,

                          (char*)bd_addr, sizeof(RawAddress), NULL);

    return BT_STATUS_SUCCESS;

  } else

  } else if ((btif_hh_cb.pending_conn_address == *bd_addr) &&

       (btif_hh_cb.status == BTIF_HH_DEV_CONNECTING)) {

    LOG(INFO) << __func__ << ": already connecting " << *bd_addr;

    return BT_STATUS_BUSY;

  }

  return BT_STATUS_FAIL;

}



/*******************************************************************************

 *

system/device/src/esco_parameters.cc

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const enh_esco_params_t default_esco_parameters[ESCO_NUM_CODECS] = { 
        .output_data_path = ESCO_DATA_PATH_PCM,

        .input_transport_unit_size = 0x00,

        .output_transport_unit_size = 0x00,

        .max_latency_ms = 0,

        .max_latency_ms = 0xFFFF,  // Don't care

        .packet_types = (ESCO_PKT_TYPES_MASK_HV1 | ESCO_PKT_TYPES_MASK_HV2 |

                         ESCO_PKT_TYPES_MASK_HV3),

        .retransmission_effort = ESCO_RETRANSMISSION_OFF,