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

Commit 12907fc9 authored by Jeremy Wu's avatar Jeremy Wu Committed by Automerger Merge Worker
Browse files

Merge "Floss: use LOG_* in a2dp_encoding_host" am: 47ae88c8 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2280330



Change-Id: I0c497ba9e7bd5051c07ce03b28af6501af416914
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a5071fe 47ae88c8

system/audio_hal_interface/a2dp_encoding_host.cc

+6 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "a2dp_encoding_host.h"



#include <base/logging.h>

#include <errno.h>

#include <grp.h>

#include <sys/stat.h>
@@ -88,7 +87,7 @@ static void a2dp_data_path_open() { 
  if (grp) {

    int res = chown(A2DP_HOST_DATA_PATH, -1, grp->gr_gid);

    if (res == -1) {

      LOG(ERROR) << __func__ << " failed: " << strerror(errno);

      LOG_ERROR("%s failed: %s", __func__, strerror(errno));

    }

  }

}
@@ -123,16 +122,16 @@ bool StartRequest() { 


  // Check if a previous request is not finished

  if (a2dp_pending_cmd_ == A2DP_CTRL_CMD_START) {

    LOG(INFO) << __func__ << ": A2DP_CTRL_CMD_START in progress";

    LOG_INFO("%s: A2DP_CTRL_CMD_START in progress", __func__);

    return false;

  } else if (a2dp_pending_cmd_ != A2DP_CTRL_CMD_NONE) {

    LOG(WARNING) << __func__ << ": busy in pending_cmd=" << a2dp_pending_cmd_;

    LOG_WARN("%s: busy in pending_cmd=%u", __func__, a2dp_pending_cmd_);

    return false;

  }



  // Don't send START request to stack while we are in a call

  if (!bluetooth::headset::IsCallIdle()) {

    LOG(ERROR) << __func__ << ": call state is busy";

    LOG_ERROR("%s: call state is busy", __func__);

    return false;

  }
@@ -157,7 +156,7 @@ bool StartRequest() { 
    a2dp_pending_cmd_ = A2DP_CTRL_CMD_NONE;

    return true;

  }

  LOG(ERROR) << __func__ << ": AV stream is not ready to start";

  LOG_ERROR("%s: AV stream is not ready to start", __func__);

  return false;

}
@@ -168,7 +167,7 @@ bool StopRequest() { 
    btif_av_clear_remote_suspend_flag();

    return true;

  }

  LOG(INFO) << __func__ << ": handling";

  LOG_INFO("%s: handling", __func__);

  a2dp_pending_cmd_ = A2DP_CTRL_CMD_STOP;

  btif_av_stream_stop(RawAddress::kEmpty);

  return true;