Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21689ed8 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by android-build-merger
Browse files

Merge "media: Change setNextOutputFile to address API review comments." into oc-dev am: 0e6cce9d 

am: 3d17f507

Change-Id: If9121b4b63a7b209084293cbe682fded3e3677dc
parents 10e85340 3d17f507

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -22969,8 +22969,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);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -24805,8 +24805,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);

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -23076,8 +23076,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);

media/java/android/media/MediaRecorder.java

+2 −2
Original line number Diff line number Diff line
@@ -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 {