diff options
| author | 2010-07-07 20:55:47 -0700 | |
|---|---|---|
| committer | 2010-07-07 20:55:47 -0700 | |
| commit | 768d98e5f3b0523fbad975a81f9eb0a05dc0fc23 (patch) | |
| tree | c3437f83f2f82135c7fe377a95f18450ce88d737 | |
| parent | 98449546fa33f420e2aef7d0d1c1afb538af4069 (diff) | |
| parent | 7017e0d5c372db1e470d9881c46b15eade051d76 (diff) | |
am 7017e0d5: am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit '7017e0d5c372db1e470d9881c46b15eade051d76'
* commit '7017e0d5c372db1e470d9881c46b15eade051d76':
Added some javadoc to Camera.takePicture()
| -rw-r--r-- | core/java/android/hardware/Camera.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 0a2899fefeba..11008862edaf 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -535,6 +535,7 @@ public class Camera { * application does not need a particular callback, a null can be passed * instead of a callback method. * + * This method is only valid after {@link #startPreview()} has been called. * This method will stop the preview. Applications should not call {@link * #stopPreview()} before this. After jpeg callback is received, * applications can call {@link #startPreview()} to restart the preview. @@ -562,6 +563,7 @@ public class Camera { * application does not need a particular callback, a null can be passed * instead of a callback method. * + * This method is only valid after {@link #startPreview()} has been called. * This method will stop the preview. Applications should not call {@link * #stopPreview()} before this. After jpeg callback is received, * applications can call {@link #startPreview()} to restart the preview. |