From c481c50a4254ed0072246c1e771a28154f6161a3 Mon Sep 17 00:00:00 2001
From: Hangyu Kuang <hkuang@google.com>
Date: Thu, 20 Apr 2017 13:53:48 -0700
Subject: [PATCH] media: Change setNextOutputFile to address API review
 comments.

Bug: 37514763
Test: CTS test
Change-Id: If0fb59f26ecf3882600ca7a8b26b6c248615bbd0
---
 api/current.txt                             | 4 ++--
 api/system-current.txt                      | 4 ++--
 api/test-current.txt                        | 4 ++--
 media/java/android/media/MediaRecorder.java | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 8cbb9ce9e942..526ac0722ff1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22968,8 +22968,8 @@ package android.media {
     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);
diff --git a/api/system-current.txt b/api/system-current.txt
index 58b75374d7a7..c626753466a1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -24804,8 +24804,8 @@ package android.media {
     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);
diff --git a/api/test-current.txt b/api/test-current.txt
index 2e401b4cb3a4..2f51515e5c76 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -23075,8 +23075,8 @@ package android.media {
     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);
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 997d56222ff7..33a7c836dec8 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -844,7 +844,7 @@ public class MediaRecorder
      * @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 @@ public class MediaRecorder
      * @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 {
-- 
2.11.0