diff options
author | Marco Nelissen <marcone@google.com> | 2013-06-10 15:06:28 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2013-06-11 17:52:50 -0700 |
commit | 05e2b6be6652e874bcd7248aeddd2c7d2fe226c5 (patch) | |
tree | dfee836846c0ea19ce229d6526af382d049dc407 | |
parent | 45bd14ffb2906265a39e11dcce5f42c80b6cb519 (diff) | |
download | base-05e2b6be6652e874bcd7248aeddd2c7d2fe226c5.tar.gz |
Unhide MediaExtractor.getPsshInfo()
b/9373882
Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
-rw-r--r-- | api/current.txt | 1 | ||||
-rw-r--r-- | media/java/android/media/MediaExtractor.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 092fe168ad0d..ed1983481262 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11883,6 +11883,7 @@ package android.media { ctor public MediaExtractor(); method public boolean advance(); method public long getCachedDuration(); + method public java.util.Map<java.util.UUID, byte[]> getPsshInfo(); method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo); method public int getSampleFlags(); method public long getSampleTime(); diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index cf159f0ed1db..e558c07d3c87 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -199,9 +199,9 @@ final public class MediaExtractor { public native final int getTrackCount(); /** - * Get the PSSH info if present. This returns a map of uuid-to-bytes, with the uuid specifying + * Get the PSSH info if present. + * @return a map of uuid-to-bytes, with the uuid specifying * the crypto scheme, and the bytes being the data specific to that scheme. - * {@hide} */ public Map<UUID, byte[]> getPsshInfo() { Map<UUID, byte[]> psshMap = null; |