summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-11-19 19:20:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-19 19:20:59 -0800
commit4e911849caa9a4c3fe7ba9d820930465ba54de29 (patch)
tree6dffb14c59691a50d926b6433c3fcbc3365a6663 /core/java/android/hardware
parent482a1b16cb805920b427f0b1adca300571fda92d (diff)
parentfb6f4505ba5c227cebb73f1269b0af5d92e6e5e6 (diff)
downloadframeworks_base-4e911849caa9a4c3fe7ba9d820930465ba54de29.zip
frameworks_base-4e911849caa9a4c3fe7ba9d820930465ba54de29.tar.gz
frameworks_base-4e911849caa9a4c3fe7ba9d820930465ba54de29.tar.bz2
am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbread
* commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6': Improve camera documentation.
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/Camera.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 378189e..f3b2c81 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -906,6 +906,7 @@ public class Camera {
* Changes the settings for this Camera service.
*
* @param params the Parameters to use for this Camera service
+ * @throws RuntimeException if any parameter is invalid or not supported.
* @see #getParameters()
*/
public void setParameters(Parameters params) {