Use system/audio to/from string converters in TypeConverter
Use of system functions eliminates the need for listing all enum
values in TypeConverter tables.
Slight changes in the converting functions:
1. 'channelMaskFromString' function now also accepts indexed
masks.
2. Fixed UB in 'formatFromString' function.
3. Removed 'deviceFromString' function, use
'DeviceConverter::fromString' instead.
Replaced direct includes of 'system/audio-base.h' with
includes of 'system/audio.h'.
Bug: 142480271
Test: m
Test: atest libmedia_helper_tests
Change-Id: Ia0e725026be80621bdc797299e63e134419b2b3d
Merged-In: Ia0e725026be80621bdc797299e63e134419b2b3d
diff --git a/services/mediametrics/AudioPowerUsage.cpp b/services/mediametrics/AudioPowerUsage.cpp
index 33dfa8fa..34be0b9 100644
--- a/services/mediametrics/AudioPowerUsage.cpp
+++ b/services/mediametrics/AudioPowerUsage.cpp
@@ -28,7 +28,7 @@
#include <cutils/properties.h>
#include <statslog.h>
#include <sys/timerfd.h>
-#include <system/audio-base.h>
+#include <system/audio.h>
// property to disable audio power use metrics feature, default is enabled
#define PROP_AUDIO_METRICS_DISABLED "persist.media.audio_metrics.power_usage_disabled"