summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-07-19 11:16:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-19 11:16:20 -0700
commitf55df0e26a71b93bda2e10de7a5b2dd9ab843765 (patch)
treeb867597e100bdf0e0c1030a7982eb3a187d3bd0b
parent50c5d2be631612d283b1d1809ca41ab5f6643cf1 (diff)
parent10e09c69d659bf54d6efbe1a3660add7f8a39d6e (diff)
downloadframeworks_base-f55df0e26a71b93bda2e10de7a5b2dd9ab843765.zip
frameworks_base-f55df0e26a71b93bda2e10de7a5b2dd9ab843765.tar.gz
frameworks_base-f55df0e26a71b93bda2e10de7a5b2dd9ab843765.tar.bz2
Merge "Add camera new picture and new video broadcast intents."
-rw-r--r--api/current.txt2
-rw-r--r--core/java/android/hardware/Camera.java18
2 files changed, 20 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 984d573..b462695 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8905,6 +8905,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();