commit 1ea842e9b24b2e3fcb92afe90309ccd96a571a1d
author Andy Hung <hunga@google.com> Mon May 18 10:47:31 2020 -0700
committer Andy Hung <hunga@google.com> Wed May 27 11:32:19 2020 -0700
tree d795e6e97330a175fd197126045212f952146713
parent b4a3b65d297a8436ba48138ce7ce2ba6b7a652b8

MediaMetrics: Update and clean proto formatting

Make code compatible with both string
and integer enumeration in the protos.

Test: adb shell dumpsys media.metrics
Test: atest mediametrics_tests
Bug: 149850236
Change-Id: I0a1c21be711f82915f3bb403860b40c695a0587d

services/mediametrics/AudioPowerUsage.cpp

diff --git a/services/mediametrics/AudioPowerUsage.cpp b/services/mediametrics/AudioPowerUsage.cpp
index b1648d9..c441110 100644
--- a/services/mediametrics/AudioPowerUsage.cpp
+++ b/services/mediametrics/AudioPowerUsage.cpp
@@ -20,6 +20,7 @@
 
 #include "AudioAnalytics.h"
 #include "MediaMetricsService.h"
+#include "StringUtils.h"
 #include <map>
 #include <sstream>
 #include <string>
@@ -117,7 +118,7 @@
 
 int32_t AudioPowerUsage::deviceFromStringPairs(const std::string& device_strings) {
     int32_t deviceMask = 0;
-    const auto devaddrvec = MediaMetricsService::getDeviceAddressPairs(device_strings);
+    const auto devaddrvec = stringutils::getDeviceAddressPairs(device_strings);
     for (const auto &[device, addr] : devaddrvec) {
         int32_t combo_device = 0;
         deviceFromString(device, combo_device);