AidlUtils: update AUGMENT_LOG to support variable arguments
- move logging macros to ConversionHelperAidl
- replace LOG_ENTRY with AUGMENT_LOG
Flag: EXEMPT bugfix
Bug: 356310696
Test: atest CoreAudioHalAidlTest
Change-Id: I3f217913679f43a9db5cde032402c94e7c252fec
diff --git a/media/libaudiohal/impl/DeviceHalAidl.cpp b/media/libaudiohal/impl/DeviceHalAidl.cpp
index f301a77..f279281 100644
--- a/media/libaudiohal/impl/DeviceHalAidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalAidl.cpp
@@ -140,7 +140,7 @@
}
status_t DeviceHalAidl::getSupportedModes(std::vector<media::audio::common::AudioMode> *modes) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
RETURN_IF_TELEPHONY_NOT_INIT(INVALID_OPERATION);
@@ -164,7 +164,7 @@
}
status_t DeviceHalAidl::initCheck() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
std::lock_guard l(mLock);
@@ -196,7 +196,7 @@
}
status_t DeviceHalAidl::getMasterVolume(float *volume) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
if (volume == nullptr) {
@@ -227,7 +227,7 @@
}
status_t DeviceHalAidl::getMicMute(bool *state) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -247,7 +247,7 @@
}
status_t DeviceHalAidl::getMasterMute(bool *state) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -306,7 +306,7 @@
}
status_t DeviceHalAidl::getInputBufferSize(struct audio_config* config, size_t* size) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -462,6 +462,7 @@
sp<StreamOutHalInterface>* outStream,
const std::vector<playback_track_metadata_v7_t>& sourceMetadata) {
AUGMENT_LOG(D, "handle: %d devices %0x flags %0x", handle, devices, flags);
+
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
if (outStream == nullptr || config == nullptr) {
@@ -611,7 +612,7 @@
}
status_t DeviceHalAidl::supportsAudioPatches(bool* supportsPatches) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
if (supportsPatches == nullptr) {
AUGMENT_LOG(E, "uninitialized supportsPatches");
@@ -727,7 +728,7 @@
}
status_t DeviceHalAidl::getAudioPort(struct audio_port* port) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
if (port == nullptr) {
AUGMENT_LOG(E, "port not initialized");
@@ -740,7 +741,7 @@
}
status_t DeviceHalAidl::getAudioPort(struct audio_port_v7 *port) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -772,7 +773,7 @@
status_t DeviceHalAidl::getAudioMixPort(const struct audio_port_v7 *devicePort,
struct audio_port_v7 *mixPort) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -796,7 +797,7 @@
}
status_t DeviceHalAidl::setAudioPortConfig(const struct audio_port_config* config) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -815,7 +816,7 @@
}
MicrophoneInfoProvider::Info const* DeviceHalAidl::getMicrophoneInfo() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT({});
@@ -842,7 +843,7 @@
status_t DeviceHalAidl::getMicrophones(
std::vector<audio_microphone_characteristic_t>* microphones) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -866,7 +867,7 @@
status_t DeviceHalAidl::addDeviceEffect(
const struct audio_port_config *device, sp<EffectHalInterface> effect) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -899,7 +900,7 @@
}
status_t DeviceHalAidl::removeDeviceEffect(
const struct audio_port_config *device, sp<EffectHalInterface> effect) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
if (device == nullptr || effect == nullptr) {
@@ -931,7 +932,7 @@
status_t DeviceHalAidl::getMmapPolicyInfos(
media::audio::common::AudioMMapPolicyType policyType,
std::vector<media::audio::common::AudioMMapPolicyInfo>* policyInfos) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -953,7 +954,7 @@
}
int32_t DeviceHalAidl::getAAudioMixerBurstCount() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -965,7 +966,7 @@
}
int32_t DeviceHalAidl::getAAudioHardwareBurstMinUsec() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -977,7 +978,7 @@
}
error::Result<audio_hw_sync_t> DeviceHalAidl::getHwAvSync() {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -994,7 +995,7 @@
}
status_t DeviceHalAidl::supportsBluetoothVariableLatency(bool* supports) {
- LOG_ENTRY();
+ AUGMENT_LOG(D);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
@@ -1006,7 +1007,7 @@
status_t DeviceHalAidl::getSoundDoseInterface([[maybe_unused]] const std::string& module,
::ndk::SpAIBinder* soundDoseBinder) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
if (soundDoseBinder == nullptr) {
@@ -1028,7 +1029,7 @@
}
status_t DeviceHalAidl::prepareToDisconnectExternalDevice(const struct audio_port_v7* port) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
if (port == nullptr) {
@@ -1067,7 +1068,7 @@
}
status_t DeviceHalAidl::setConnectedState(const struct audio_port_v7 *port, bool connected) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
if (port == nullptr) {
@@ -1099,7 +1100,7 @@
}
status_t DeviceHalAidl::setSimulateDeviceConnections(bool enabled) {
- LOG_ENTRY_V();
+ AUGMENT_LOG(V);
TIME_CHECK();
RETURN_IF_MODULE_NOT_INIT(NO_INIT);
{