diff options
| author | 2010-07-07 17:21:46 -0700 | |
|---|---|---|
| committer | 2010-07-07 17:21:46 -0700 | |
| commit | 7017e0d5c372db1e470d9881c46b15eade051d76 (patch) | |
| tree | 867344227796d99e75c8aeda36ff99c91c42a7e6 | |
| parent | b91881fdd1608cc922f105ec552b5505da1fecb9 (diff) | |
| parent | f3f25bf80b7d21f12442da8f82d17c79dd371692 (diff) | |
am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692' into gingerbread-plus-aosp
* commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692':
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. |