diff options
| author | 2021-03-25 03:16:34 +0000 | |
|---|---|---|
| committer | 2021-03-25 03:16:34 +0000 | |
| commit | 201c39ba906b0410b01677cd7572a7a183abc95c (patch) | |
| tree | 348bee8ffcf3a5ec753a25217177ade35ad528e0 | |
| parent | 066cd28370cb4e6afc584c82997bc40382594c82 (diff) | |
| parent | f65fcbdbbd7a6dd3f76ed7fab4e3c8fbd89a0586 (diff) | |
Merge "media: make ParameterDescriptor static"
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 4ba49a363798..e696312c70b8 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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(); } diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index a2108bd3ef2c..7062f83fe575 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -4576,7 +4576,7 @@ final public class MediaCodec { /** * Contains description of a parameter. */ - public class ParameterDescriptor { + public static class ParameterDescriptor { private ParameterDescriptor() {} /** |