Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "media: make ParameterDescriptor static" am: 201c39ba90 am: e29ed20fff

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

Change-Id: I5d7de95191f9da3b23ea1ed6ba3851b2958181fd
This commit is contained in:
Treehugger Robot
2021-03-25 04:06:08 +00:00
committed by Automerger Merge Worker
parent 616b2a267f e29ed20fff
commit 1632f384c0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -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();
}

2
media/java/android/media/MediaCodec.java
View File

@@ -4576,7 +4576,7 @@ final public class MediaCodec {
/**
* Contains description of a parameter.
*/
public class ParameterDescriptor {
public static class ParameterDescriptor {
private ParameterDescriptor() {}
/**