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

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

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

Merge "media: make ParameterDescriptor static" am: 201c39ba am: e29ed20f am: 1632f384 am: fa07059f

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

Change-Id: I3e6dbc02b38b7bdb06c6767f707d34ffb401488e
parents a6b80e4e fa07059f

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -21515,7 +21515,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();















  }

























media/java/android/media/MediaCodec.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -4710,7 +4710,7 @@ final public class MediaCodec {













    /**















     * Contains description of a parameter.















     */













    public class ParameterDescriptor {













    public static class ParameterDescriptor {















        private ParameterDescriptor() {}































        /**