From 60c0c5e2787b1f46e14ace2cdbb39699cf9fc437 Mon Sep 17 00:00:00 2001 From: Phil Burk Date: Tue, 28 Apr 2020 14:16:38 -0700 Subject: [PATCH] aaudio: remove LOG_ALWAYS_FATAL_IF from metrics Old assert was for debugging. No longer needed. Caused a CTS failure in MediaMetrics logging. Bug: 155188361 Test: atest CtsNativeMediaAAudioTestCases Test: adb shell dumpsys media.metrics Change-Id: I592937d6a0683faf6835d3f0d5a982d02f59e7a9 --- media/libaaudio/src/core/AudioStream.cpp | 26 +++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/media/libaaudio/src/core/AudioStream.cpp b/media/libaaudio/src/core/AudioStream.cpp index 17d389ed71..0644368c82 100644 --- a/media/libaaudio/src/core/AudioStream.cpp +++ b/media/libaaudio/src/core/AudioStream.cpp @@ -106,21 +106,23 @@ aaudio_result_t AudioStream::open(const AudioStreamBuilder& builder) } void AudioStream::logOpen() { - LOG_ALWAYS_FATAL_IF(mMetricsId.size() == 0, "mMetricsId is empty!"); - android::mediametrics::LogItem(mMetricsId) - .set(AMEDIAMETRICS_PROP_PERFORMANCEMODE, - AudioGlobal_convertPerformanceModeToText(getPerformanceMode())) - .set(AMEDIAMETRICS_PROP_SHARINGMODE, - AudioGlobal_convertSharingModeToText(getSharingMode())) - .record(); + if (mMetricsId.size() > 0) { + android::mediametrics::LogItem(mMetricsId) + .set(AMEDIAMETRICS_PROP_PERFORMANCEMODE, + AudioGlobal_convertPerformanceModeToText(getPerformanceMode())) + .set(AMEDIAMETRICS_PROP_SHARINGMODE, + AudioGlobal_convertSharingModeToText(getSharingMode())) + .record(); + } } void AudioStream::logBufferState() { - LOG_ALWAYS_FATAL_IF(mMetricsId.size() == 0, "mMetricsId is empty!"); - android::mediametrics::LogItem(mMetricsId) - .set(AMEDIAMETRICS_PROP_BUFFERSIZEFRAMES, (int32_t) getBufferSize()) - .set(AMEDIAMETRICS_PROP_UNDERRUN, (int32_t) getXRunCount()) - .record(); + if (mMetricsId.size() > 0) { + android::mediametrics::LogItem(mMetricsId) + .set(AMEDIAMETRICS_PROP_BUFFERSIZEFRAMES, (int32_t) getBufferSize()) + .set(AMEDIAMETRICS_PROP_UNDERRUN, (int32_t) getXRunCount()) + .record(); + } } aaudio_result_t AudioStream::systemStart() {