Revert "AAudio: add support of Audio Attributes tags"
This reverts commit 5b8947647a8b2f2a7e15d076fb1624c6604d99d0.
Reason for revert: DroidMonitor: Potential culprit for http://b/376495030 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I66b82abfa2e8ecc82c8c515bd788506497796039
diff --git a/services/oboeservice/AAudioServiceEndpoint.cpp b/services/oboeservice/AAudioServiceEndpoint.cpp
index e49e9e7..e7d14a0 100644
--- a/services/oboeservice/AAudioServiceEndpoint.cpp
+++ b/services/oboeservice/AAudioServiceEndpoint.cpp
@@ -25,7 +25,6 @@
#include <sstream>
#include <vector>
-#include <system/aaudio/AAudio.h>
#include <utils/Singleton.h>
@@ -196,28 +195,20 @@
? AAudioConvert_inputPresetToAudioSource(params->getInputPreset())
: AUDIO_SOURCE_DEFAULT;
audio_flags_mask_t flags;
- std::optional<std::string> optTags = {};
if (direction == AAUDIO_DIRECTION_OUTPUT) {
flags = AAudio_computeAudioFlagsMask(
params->getAllowedCapturePolicy(),
params->getSpatializationBehavior(),
params->isContentSpatialized(),
AUDIO_OUTPUT_FLAG_FAST);
- optTags = params->getTags();
} else {
flags = static_cast<audio_flags_mask_t>(AUDIO_FLAG_LOW_LATENCY
| AAudioConvert_privacySensitiveToAudioFlagsMask(params->isPrivacySensitive()));
}
- audio_attributes_t nativeAttributes = {
+ return {
.content_type = contentType,
.usage = usage,
.source = source,
.flags = flags,
- .tags = ""
- };
- if (optTags.has_value() && !optTags->empty()) {
- strncpy(nativeAttributes.tags, optTags.value().c_str(), AAUDIO_ATTRIBUTES_TAGS_MAX_SIZE);
- nativeAttributes.tags[AAUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1] = '\0';
- }
- return nativeAttributes;
+ .tags = "" };
}