Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14d8e6e5 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23609 into eclair 

* changes:
  Fix SDK build breakage.
parents 940da983 1c632933

core/java/android/hardware/Camera.java

+3 −2
Original line number Diff line number Diff line
@@ -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

     */