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

Commit f55df0e2 authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android (Google) Code Review
Browse files

Merge "Add camera new picture and new video broadcast intents."

parents 50c5d2be 10e09c69

api/current.txt

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

  }

core/java/android/hardware/Camera.java

+18 −0
Original line number Diff line number Diff line
@@ -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;
@@ -141,6 +143,22 @@ public class Camera { 
    private boolean mOneShot;

    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.

     */