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

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

Merge "MediaCodec: describe bundle keys for onMetricsFlushed callback" into... 

Merge "MediaCodec: describe bundle keys for onMetricsFlushed callback" into main am: 2f54c684 am: 6ff0a7fd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3437059



Change-Id: Ib3a0663ed3ebd9530f56638888b24ea9609d7a41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b526ff7d 6ff0a7fd

media/java/android/media/MediaCodec.java

+6 −1
Original line number Diff line number Diff line
@@ -5878,7 +5878,12 @@ final public class MediaCodec { 
         * capture the final metrics for the previous subsession.

         *

         * @param codec The MediaCodec object.

         * @param metrics The flushed metrics for this codec.

         * @param metrics The flushed metrics for this codec. This is a

         *                {@link PersistableBundle} containing the set of

         *                attributes and values available for the media being

         *                handled by this instance of MediaCodec. The attributes

         *                are described in {@link MetricsConstants}. Additional

         *                vendor-specific fields may also be present.

         */

        @FlaggedApi(FLAG_SUBSESSION_METRICS)

        public void onMetricsFlushed(