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

Commit 7017e0d5 authored by Dan Tasse's avatar Dan Tasse Committed by Android Git Automerger
Browse files

am f3f25bf8: Added some javadoc to Camera.takePicture() 

Merge commit 'f3f25bf8' into gingerbread-plus-aosp

* commit 'f3f25bf8':
  Added some javadoc to Camera.takePicture()
parents b91881fd f3f25bf8

core/java/android/hardware/Camera.java

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

     * application does not need a particular callback, a null can be passed

     * instead of a callback method.

     * 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

     * This method will stop the preview. Applications should not call {@link

     * #stopPreview()} before this. After jpeg callback is received,

     * #stopPreview()} before this. After jpeg callback is received,

     * applications can call {@link #startPreview()} to restart the preview.

     * 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

     * application does not need a particular callback, a null can be passed

     * instead of a callback method.

     * 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

     * This method will stop the preview. Applications should not call {@link

     * #stopPreview()} before this. After jpeg callback is received,

     * #stopPreview()} before this. After jpeg callback is received,

     * applications can call {@link #startPreview()} to restart the preview.

     * applications can call {@link #startPreview()} to restart the preview.