commit c481c50a4254ed0072246c1e771a28154f6161a3
author Hangyu Kuang <hkuang@google.com> Thu Apr 20 13:53:48 2017 -0700
committer Hangyu Kuang <hkuang@google.com> Thu Apr 20 13:53:48 2017 -0700
tree 19610a9af77ab1a5f178f7d287b33472539408b7
parent fd25662e034e260e32616b680e25287b53a11452

media: Change setNextOutputFile to address API review comments.

Bug: 37514763
Test: CTS test
Change-Id: If0fb59f26ecf3882600ca7a8b26b6c248615bbd0

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 8cbb9ce..526ac07 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22968,8 +22968,8 @@
     method public void setLocation(float, float);
     method public void setMaxDuration(int) throws java.lang.IllegalArgumentException;
     method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException;
-    method public void setNextOutputFile(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalStateException;
-    method public void setNextOutputFile(java.io.File) throws java.io.IOException, java.lang.IllegalStateException;
+    method public void setNextOutputFile(java.io.FileDescriptor) throws java.io.IOException;
+    method public void setNextOutputFile(java.io.File) throws java.io.IOException;
     method public void setOnErrorListener(android.media.MediaRecorder.OnErrorListener);
     method public void setOnInfoListener(android.media.MediaRecorder.OnInfoListener);
     method public void setOrientationHint(int);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 58b7537..c626753 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -24804,8 +24804,8 @@
     method public void setLocation(float, float);
     method public void setMaxDuration(int) throws java.lang.IllegalArgumentException;
     method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException;
-    method public void setNextOutputFile(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalStateException;
-    method public void setNextOutputFile(java.io.File) throws java.io.IOException, java.lang.IllegalStateException;
+    method public void setNextOutputFile(java.io.FileDescriptor) throws java.io.IOException;
+    method public void setNextOutputFile(java.io.File) throws java.io.IOException;
     method public void setOnErrorListener(android.media.MediaRecorder.OnErrorListener);
     method public void setOnInfoListener(android.media.MediaRecorder.OnInfoListener);
     method public void setOrientationHint(int);

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 2e401b4..2f51515 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -23075,8 +23075,8 @@
     method public void setLocation(float, float);
     method public void setMaxDuration(int) throws java.lang.IllegalArgumentException;
     method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException;
-    method public void setNextOutputFile(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalStateException;
-    method public void setNextOutputFile(java.io.File) throws java.io.IOException, java.lang.IllegalStateException;
+    method public void setNextOutputFile(java.io.FileDescriptor) throws java.io.IOException;
+    method public void setNextOutputFile(java.io.File) throws java.io.IOException;
     method public void setOnErrorListener(android.media.MediaRecorder.OnErrorListener);
     method public void setOnInfoListener(android.media.MediaRecorder.OnInfoListener);
     method public void setOrientationHint(int);

media/java/android/media/MediaRecorder.java

diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 997d562..33a7c83 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -844,7 +844,7 @@
      * @throws IllegalStateException if it is called before prepare().
      * @throws IOException if setNextOutputFile fails otherwise.
      */
-    public void setNextOutputFile(FileDescriptor fd) throws IllegalStateException, IOException
+    public void setNextOutputFile(FileDescriptor fd) throws IOException
     {
         _setNextOutputFile(fd);
     }
@@ -881,7 +881,7 @@
      * @throws IllegalStateException if it is called before prepare().
      * @throws IOException if setNextOutputFile fails otherwise.
      */
-    public void setNextOutputFile(File file) throws IllegalStateException, IOException
+    public void setNextOutputFile(File file) throws IOException
     {
         RandomAccessFile f = new RandomAccessFile(file, "rws");
         try {