Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev

2 files changed, 3 insertions, 2 deletions

diff --git a/api/current.txt b/api/current.txt
index a98c7a07c356..02b95a0fc10b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11884,6 +11884,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;