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

Commit 20b213c7 authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android Git Automerger
Browse files

am 64fc8082: am 40057ce7: Document that stopPreview is not needed before takePicture. 

Merge commit '64fc8082' into eclair-mr2-plus-aosp

* commit '64fc8082':
  Document that stopPreview is not needed before takePicture.
parents a6c4556d 64fc8082

core/java/android/hardware/Camera.java

+8 −0
Original line number Diff line number Diff line
@@ -477,6 +477,10 @@ public class Camera { 
     * application does not need a particular callback, a null can be passed

     * instead of a callback method.

     *

     * 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.

     *

     * @param shutter   callback after the image is captured, may be null

     * @param raw       callback with raw image data, may be null

     * @param jpeg      callback with jpeg image data, may be null
@@ -500,6 +504,10 @@ public class Camera { 
     * application does not need a particular callback, a null can be passed

     * instead of a callback method.

     *

     * 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.

     *

     * @param shutter   callback after the image is captured, may be null

     * @param raw       callback with raw image data, may be null

     * @param postview  callback with postview image data, may be null