summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-04-20 10:55:54 -0700
committerAndreas Huber <andih@google.com>2011-04-20 10:55:54 -0700
commit72e738a428d7bb39a371da6105f7e2084e67e39d (patch)
treeb7a8e15f9c48650515d01eb6cdd4695f55be280c /media
parente85626f33e6988b3314d8978c23923f91c3f49c9 (diff)
downloadframeworks_base-72e738a428d7bb39a371da6105f7e2084e67e39d.zip
frameworks_base-72e738a428d7bb39a371da6105f7e2084e67e39d.tar.gz
frameworks_base-72e738a428d7bb39a371da6105f7e2084e67e39d.tar.bz2
Unhide MediaPlayer's setDataSource method that takes optional http headers to be
passed to the server. Change-Id: I3c7ce140b2d9cd2483cf05c8aff9b374feff2f18 related-to-bug: 4315346
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaPlayer.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index 1e4b585..5865b92 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -745,7 +745,6 @@ public class MediaPlayer
* @param uri the Content URI of the data you want to play
* @param headers the headers to be sent together with the request for the data
* @throws IllegalStateException if it is called in an invalid state
- * @hide pending API council
*/
public void setDataSource(Context context, Uri uri, Map<String, String> headers)
throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {