Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 23609 into eclair

Browse Source 
* changes:
  Fix SDK build breakage.
This commit is contained in:
Android (Google) Code Review
2009-09-02 00:07:09 -07:00
parent 940da9836a 1c632933d9
commit 14d8e6e5d5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/Camera.java
View File

@@ -182,7 +182,7 @@ public class Camera {
* @param data The contents of the preview frame in {@link
* android.hardware.Camera.Parameters#getPreviewFormat()}
* format. If {@link
* android.hardware.Camera.Parameters#setPreviewFormat()}
* android.hardware.Camera.Parameters#setPreviewFormat(int)}
* is never called, the default will be the YCbCr_420_SP
* (NV21) format.
* @param camera The Camera service object.
@@ -341,7 +341,8 @@ public class Camera {
* Starts auto-focus function and registers a callback function to run when
* camera is focused. Only valid after startPreview() has been called. If
* the camera does not support auto-focus, it is a no-op and {@link
* AutoFocusCallback#onAutoFocus} callback will be called immediately.
* AutoFocusCallback#onAutoFocus(boolean, Camera)} callback will be called
* immediately.
*
* @param cb the callback to run
*/