Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97149901 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Avoid "android.media.mediacodec.log-session-id" print redundancy" into main am: 4fd5bbcf am: f5c1a039

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2646402



Change-Id: I0d2be7f592a78af1c517d955999bb9d0cb7c4cfc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4070173a f5c1a039

media/libstagefright/MediaCodec.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2202,7 +2202,9 @@ status_t MediaCodec::configure( 
        mediametrics_setInt32(nextMetricsHandle, kCodecEncoder,

                              (flags & CONFIGURE_FLAG_ENCODE) ? 1 : 0);



        if (!mLogSessionId.empty()) {

            mediametrics_setCString(nextMetricsHandle, kCodecLogSessionId, mLogSessionId.c_str());

        }



        // moved here from ::init()

        mediametrics_setCString(nextMetricsHandle, kCodecCodec, mInitName.c_str());