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

Commit ac018be8 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Bug 3438513 Fix incorrect throws clause"

parents da21e030 dbc289d6

api/11.xml

+2 −0
Original line number Diff line number Diff line
@@ -90761,6 +90761,8 @@ 
>

<parameter name="surfaceTexture" type="android.graphics.SurfaceTexture">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="setZoomChangeListener"

 return="void"

api/current.xml

+2 −0
Original line number Diff line number Diff line
@@ -90906,6 +90906,8 @@ 
>

<parameter name="surfaceTexture" type="android.graphics.SurfaceTexture">

</parameter>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="setZoomChangeListener"

 return="void"

core/java/android/hardware/Camera.java

+2 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ public class Camera { 
        }

    }



    private native final void setPreviewDisplay(Surface surface);

    private native final void setPreviewDisplay(Surface surface) throws IOException;



    /**

     * Sets the {@link SurfaceTexture} to be used for live preview.
@@ -380,7 +380,7 @@ public class Camera { 
     * @throws IOException if the method fails (for example, if the surface

     *     texture is unavailable or unsuitable).

     */

    public native final void setPreviewTexture(SurfaceTexture surfaceTexture);

    public native final void setPreviewTexture(SurfaceTexture surfaceTexture) throws IOException;



    /**

     * Callback interface used to deliver copies of preview frames as