commit 4fd5bbcf1e14bc5910653ef60da037d5f228af8c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 03 18:54:46 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 03 18:54:46 2023 +0000
tree 559cf3adfa65358d4c83e6c9bb7caa747334cfc8
parent 00193efa53b7782bbef450bcc1bf7323bb9b50bd
parent 015afd81734746fff1cdf57c29d20ca96ec06f96

Merge "Avoid "android.media.mediacodec.log-session-id" print redundancy" into main

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 5c9f68e..e7b0c35 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -2005,7 +2005,9 @@
         mediametrics_setInt32(nextMetricsHandle, kCodecEncoder,
                               (flags & CONFIGURE_FLAG_ENCODE) ? 1 : 0);
 
-        mediametrics_setCString(nextMetricsHandle, kCodecLogSessionId, mLogSessionId.c_str());
+        if (!mLogSessionId.empty()) {
+            mediametrics_setCString(nextMetricsHandle, kCodecLogSessionId, mLogSessionId.c_str());
+        }
 
         // moved here from ::init()
         mediametrics_setCString(nextMetricsHandle, kCodecCodec, mInitName.c_str());