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 am: 1632f384c0

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

Change-Id: I243bb389f22e0f651aef0397f24aee7c12af7ad0
This commit is contained in:
Treehugger Robot
2021-03-25 04:32:16 +00:00
committed by Automerger Merge Worker
parent 38dcf6a83c 1632f384c0
commit fa07059fe9
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

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

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

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