commit c9b6f8bcf560405c7091c1f77544f1d6938f39fb
author Andy Hung <hunga@google.com> Thu Jul 08 10:17:55 2021 -0700
committer Andy Hung <hunga@google.com> Thu Jul 15 18:51:54 2021 -0700
tree c40e78b0a3913a8dcb1aaba257d9810062a0eeb8
parent 22cd76f5aab7046685742a5f08602d16811b8b66

MediaMetricsService: Restrict session ids to those from MediaMetricsManager

Test: atest AudioTrackTest#testSetLogSessionId
Test: adb shell dumpsys media.metrics
Bug: 193265974
Change-Id: I5e165870b29dc8349a577b0c581a49e2bc60470c

services/mediametrics/statsd_codec.cpp

diff --git a/services/mediametrics/statsd_codec.cpp b/services/mediametrics/statsd_codec.cpp
index 46cbdc8..8581437 100644
--- a/services/mediametrics/statsd_codec.cpp
+++ b/services/mediametrics/statsd_codec.cpp
@@ -34,7 +34,7 @@
 
 #include "cleaner.h"
 #include "MediaMetricsService.h"
-#include "StringUtils.h"
+#include "ValidateId.h"
 #include "frameworks/proto_logging/stats/message/mediametrics_message.pb.h"
 #include "iface_statsd.h"
 
@@ -228,7 +228,7 @@
 
     std::string sessionId;
     if (item->getString("android.media.mediacodec.log-session-id", &sessionId)) {
-        sessionId = mediametrics::stringutils::sanitizeLogSessionId(sessionId);
+        sessionId = mediametrics::ValidateId::get()->validateId(sessionId);
         metrics_proto.set_log_session_id(sessionId);
     }
     AStatsEvent_writeString(event, codec.c_str());