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

Commit cd3fd585 authored by Hui Peng's avatar Hui Peng
Browse files

Replace Log Statements in system/btif 

Test: refactoring CL. Existing unit tests still pass
Bug: 174487588
Tag: #security
Change-Id: I90e610b48582508f5fbbb4613e23434e0eaac00b
parent 85e190e7

system/btif/avrcp/avrcp_service.cc

+6 −3
Original line number Original line Diff line number Diff line
@@ -401,19 +401,22 @@ ServiceInterface* AvrcpService::GetServiceInterface() { 
}

}





void AvrcpService::ConnectDevice(const RawAddress& bdaddr) {

void AvrcpService::ConnectDevice(const RawAddress& bdaddr) {

  LOG(INFO) << __PRETTY_FUNCTION__ << ": address=" << bdaddr.ToString();

  LOG(INFO) << __PRETTY_FUNCTION__

            << ": address=" << ADDRESS_TO_LOGGABLE_STR(bdaddr);





  connection_handler_->ConnectDevice(bdaddr);

  connection_handler_->ConnectDevice(bdaddr);

}

}





void AvrcpService::DisconnectDevice(const RawAddress& bdaddr) {

void AvrcpService::DisconnectDevice(const RawAddress& bdaddr) {

  LOG(INFO) << __PRETTY_FUNCTION__ << ": address=" << bdaddr.ToString();

  LOG(INFO) << __PRETTY_FUNCTION__

            << ": address=" << ADDRESS_TO_LOGGABLE_STR(bdaddr);

  connection_handler_->DisconnectDevice(bdaddr);

  connection_handler_->DisconnectDevice(bdaddr);

}

}





void AvrcpService::SetBipClientStatus(const RawAddress& bdaddr,

void AvrcpService::SetBipClientStatus(const RawAddress& bdaddr,

                                      bool connected) {

                                      bool connected) {

  LOG(INFO) << __PRETTY_FUNCTION__ << ": address=" << bdaddr.ToString()

  LOG(INFO) << __PRETTY_FUNCTION__

            << ": address=" << ADDRESS_TO_LOGGABLE_STR(bdaddr)

            << ", connected=" << connected;

            << ", connected=" << connected;

  connection_handler_->SetBipClientStatus(bdaddr, connected);

  connection_handler_->SetBipClientStatus(bdaddr, connected);

}

}

system/btif/co/bta_av_co.cc

+72 −63

File changed.

Preview size limit exceeded, changes collapsed.

system/btif/co/bta_hh_co.cc

+8 −5

File changed.

Preview size limit exceeded, changes collapsed.

system/btif/src/btif_a2dp.cc

+5 −5
Original line number Original line Diff line number Diff line
@@ -134,8 +134,8 @@ void btif_a2dp_on_suspended(tBTA_AV_SUSPEND* p_av_suspend) { 
void btif_a2dp_on_offload_started(const RawAddress& peer_addr,

void btif_a2dp_on_offload_started(const RawAddress& peer_addr,

                                  tBTA_AV_STATUS status) {

                                  tBTA_AV_STATUS status) {

  tA2DP_CTRL_ACK ack;

  tA2DP_CTRL_ACK ack;

  LOG_INFO("%s: peer %s status %d", __func__, peer_addr.ToString().c_str(),

  LOG_INFO("%s: peer %s status %d", __func__,

           status);

           ADDRESS_TO_LOGGABLE_CSTR(peer_addr), status);





  switch (status) {

  switch (status) {

    case BTA_AV_SUCCESS:

    case BTA_AV_SUCCESS:
@@ -143,12 +143,12 @@ void btif_a2dp_on_offload_started(const RawAddress& peer_addr, 
      break;

      break;

    case BTA_AV_FAIL_RESOURCES:

    case BTA_AV_FAIL_RESOURCES:

      LOG_ERROR("%s: peer %s FAILED UNSUPPORTED", __func__,

      LOG_ERROR("%s: peer %s FAILED UNSUPPORTED", __func__,

                peer_addr.ToString().c_str());

                ADDRESS_TO_LOGGABLE_CSTR(peer_addr));

      ack = A2DP_CTRL_ACK_UNSUPPORTED;

      ack = A2DP_CTRL_ACK_UNSUPPORTED;

      break;

      break;

    default:

    default:

      LOG_ERROR("%s: peer %s FAILED: status = %d", __func__,

      LOG_ERROR("%s: peer %s FAILED: status = %d", __func__,

                peer_addr.ToString().c_str(), status);

                ADDRESS_TO_LOGGABLE_CSTR(peer_addr), status);

      ack = A2DP_CTRL_ACK_FAILURE;

      ack = A2DP_CTRL_ACK_FAILURE;

      break;

      break;

  }

  }
@@ -158,7 +158,7 @@ void btif_a2dp_on_offload_started(const RawAddress& peer_addr, 
      // suspend is triggered for remote start. Disconnect only if SoC

      // suspend is triggered for remote start. Disconnect only if SoC

      // returned failure for offload VSC

      // returned failure for offload VSC

      LOG_ERROR("%s: peer %s offload start failed", __func__,

      LOG_ERROR("%s: peer %s offload start failed", __func__,

                peer_addr.ToString().c_str());

                ADDRESS_TO_LOGGABLE_CSTR(peer_addr));

      btif_av_src_disconnect_sink(peer_addr);

      btif_av_src_disconnect_sink(peer_addr);

    }

    }

  }

  }

system/btif/src/btif_a2dp_sink.cc

+2 −1
Original line number Original line Diff line number Diff line
@@ -276,7 +276,8 @@ bool btif_a2dp_sink_restart_session(const RawAddress& old_peer_address, 
}

}





bool btif_a2dp_sink_end_session(const RawAddress& peer_address) {

bool btif_a2dp_sink_end_session(const RawAddress& peer_address) {

  LOG_INFO("%s: peer_address=%s", __func__, peer_address.ToString().c_str());

  LOG_INFO("%s: peer_address=%s", __func__,

           ADDRESS_TO_LOGGABLE_CSTR(peer_address));

  btif_a2dp_sink_cb.worker_thread.DoInThread(

  btif_a2dp_sink_cb.worker_thread.DoInThread(

      FROM_HERE, base::BindOnce(btif_a2dp_sink_end_session_delayed));

      FROM_HERE, base::BindOnce(btif_a2dp_sink_end_session_delayed));

  return true;

  return true;