commit 2de0771da2b6c07f717d62ae4e4be93702af9a43
author Andreas Huber <andih@google.com> Mon Apr 15 15:16:26 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 15 15:16:27 2013 +0000
tree 578beee51b20e27f8951b7e660b1a995b0ce432b
parent 5c5c3f3abd8a95bf46378fd93b13160ad52e74ff
parent a57da0dc5a5b863cdb12287699ba58f34529bd62

Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 32b576f..794f0b2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11817,10 +11817,10 @@
     method public void seekTo(long, int);
     method public void selectTrack(int);
     method public final void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException;
-    method public final void setDataSource(java.lang.String, java.util.Map<java.lang.String, java.lang.String>);
-    method public final void setDataSource(java.lang.String);
-    method public final void setDataSource(java.io.FileDescriptor);
-    method public final void setDataSource(java.io.FileDescriptor, long, long);
+    method public final void setDataSource(java.lang.String, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException;
+    method public final void setDataSource(java.lang.String) throws java.io.IOException;
+    method public final void setDataSource(java.io.FileDescriptor) throws java.io.IOException;
+    method public final void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException;
     method public void unselectTrack(int);
     field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2
     field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1

media/java/android/media/MediaExtractor.java

diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java
index 286e203..cf159f0 100644
--- a/media/java/android/media/MediaExtractor.java
+++ b/media/java/android/media/MediaExtractor.java
@@ -67,7 +67,7 @@
      * Sets the DataSource object to be used as the data source for this extractor
      * {@hide}
      */
-    public native final void setDataSource(DataSource source);
+    public native final void setDataSource(DataSource source) throws IOException;
 
     /**
      * Sets the data source as a content Uri.
@@ -121,7 +121,8 @@
      * @param path the path of the file, or the http URL
      * @param headers the headers associated with the http request for the stream you want to play
      */
-    public final void setDataSource(String path, Map<String, String> headers) {
+    public final void setDataSource(String path, Map<String, String> headers)
+        throws IOException {
         String[] keys = null;
         String[] values = null;
 
@@ -140,7 +141,7 @@
     }
 
     private native final void setDataSource(
-            String path, String[] keys, String[] values);
+            String path, String[] keys, String[] values) throws IOException;
 
     /**
      * Sets the data source (file-path or http URL) to use.
@@ -154,7 +155,7 @@
      * As an alternative, the application could first open the file for reading,
      * and then use the file descriptor form {@link #setDataSource(FileDescriptor)}.
      */
-    public final void setDataSource(String path) {
+    public final void setDataSource(String path) throws IOException {
         setDataSource(path, null, null);
     }
 
@@ -164,7 +165,7 @@
      *
      * @param fd the FileDescriptor for the file you want to extract from.
      */
-    public final void setDataSource(FileDescriptor fd) {
+    public final void setDataSource(FileDescriptor fd) throws IOException {
         setDataSource(fd, 0, 0x7ffffffffffffffL);
     }
 
@@ -178,7 +179,7 @@
      * @param length the length in bytes of the data to be extracted
      */
     public native final void setDataSource(
-            FileDescriptor fd, long offset, long length);
+            FileDescriptor fd, long offset, long length) throws IOException;
 
     @Override
     protected void finalize() {