diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 5418072..1fba013 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8903,6 +8903,8 @@ package android.hardware { method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback); method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback); method public final void unlock(); + field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE"; + field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64 field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1 } diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 7d67e11..a168260 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -16,6 +16,8 @@ package android.hardware; +import android.annotation.SdkConstant; +import android.annotation.SdkConstant.SdkConstantType; import android.graphics.ImageFormat; import android.graphics.Rect; import android.graphics.SurfaceTexture; @@ -142,6 +144,22 @@ public class Camera { private boolean mWithBuffer; /** + * Broadcast Action: A new picture is taken by the camera, and the entry of + * the picture has been added to the media store. + * {@link android.content.Intent#getData} is URI of the picture. + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE"; + + /** + * Broadcast Action: A new video is recorded by the camera, and the entry + * of the video has been added to the media store. + * {@link android.content.Intent#getData} is URI of the video. + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO"; + + /** * Returns the number of physical cameras available on this device. */ public native static int getNumberOfCameras(); |