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

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

Merge "media: make ParameterDescriptor static" am: 201c39ba am: e29ed20f

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

Change-Id: I5d7de95191f9da3b23ea1ed6ba3851b2958181fd
parents 616b2a26 e29ed20f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20589,7 +20589,7 @@ package android.media {
    method public long getPresentationTimeUs();
  }
  public class MediaCodec.ParameterDescriptor {
  public static class MediaCodec.ParameterDescriptor {
    method @NonNull public String getName();
    method public int getType();
  }
+1 −1
Original line number Diff line number Diff line
@@ -4576,7 +4576,7 @@ final public class MediaCodec {
    /**
     * Contains description of a parameter.
     */
    public class ParameterDescriptor {
    public static class ParameterDescriptor {
        private ParameterDescriptor() {}

        /**