Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #26695393: Remove NEW_PICTURE and NEW_VIDEO broadcast" into nyc-dev am: 76c970de3c

Browse Source 
am: 39d8714086

* commit '39d87140866399eaa6f7bb033f0f74342d2b1c52':
  Fix issue #26695393: Remove NEW_PICTURE and NEW_VIDEO broadcast
This commit is contained in:
Dianne Hackborn
2016-02-23 03:40:35 +00:00
committed by android-build-merger
parent adc3ed85b2 39d8714086
commit 1718385e10
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/hardware/Camera.java
View File

@@ -19,6 +19,7 @@ package android.hardware;
import android.app.ActivityThread;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.app.job.JobInfo;
import android.content.Context;
import android.graphics.ImageFormat;
import android.graphics.Point;
@@ -177,19 +178,27 @@ public class Camera {
private static final int NO_ERROR = 0;
/**
* @deprecated This broadcast is no longer delivered by the system; use
* {@link android.app.job.JobInfo.Builder JobInfo.Builder}.{@link android.app.job.JobInfo.Builder#addTriggerContentUri}
* instead.
* 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)
@Deprecated
public static final String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";
/**
* @deprecated This broadcast is no longer delivered by the system; use
* {@link android.app.job.JobInfo.Builder JobInfo.Builder}.{@link android.app.job.JobInfo.Builder#addTriggerContentUri}
* instead.
* 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)
@Deprecated
public static final String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";
/**