Merge "Bug 3438513 Fix incorrect throws clause"
diff --git a/api/11.xml b/api/11.xml
index 4a40c36..61472a3 100644
--- a/api/11.xml
+++ b/api/11.xml
@@ -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"
diff --git a/api/current.xml b/api/current.xml
index ea86e3b..08227e3 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -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"
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 207785c..c2f3ae7 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -357,7 +357,7 @@
}
}
- 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 @@
* @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