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

am dad32938: Merge "Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent." into jb-mr1-dev

Browse Source 
* commit 'dad32938cd22c82ae54d0555d205f33c8462e3fb':
  Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent.
This commit is contained in:
Wu-cheng Li
2012-08-24 00:35:05 -07:00
committed by Android Git Automerger
parent fc09065229 dad32938cd
commit 248ca045fc
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/provider/MediaStore.java
View File

@@ -120,7 +120,7 @@ public final class MediaStore {
*/ */
public static final String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH = public static final String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH =
"android.media.action.MEDIA_PLAY_FROM_SEARCH"; "android.media.action.MEDIA_PLAY_FROM_SEARCH";
/** /**
* The name of the Intent-extra used to define the artist * The name of the Intent-extra used to define the artist
*/ */
@@ -172,6 +172,23 @@ public final class MediaStore {
*/ */
public static final String INTENT_ACTION_STILL_IMAGE_CAMERA = "android.media.action.STILL_IMAGE_CAMERA"; public static final String INTENT_ACTION_STILL_IMAGE_CAMERA = "android.media.action.STILL_IMAGE_CAMERA";
/**
* The name of the Intent action used to launch a camera in still image mode
* for use when the device is secured (e.g. with a pin, password, pattern,
* or face unlock). Applications responding to this intent must not expose
* any personal content like existing photos or videos on the device. The
* applications should be careful not to share any photo or video with other
* applications or internet. The activity should use {@link
* android.view.WindowManager.LayoutParams#FLAG_SHOW_WHEN_LOCKED} to display
* on top of the lock screen while secured. There is no activity stack when
* this flag is used, so launching more than one activity is strongly
* discouraged.
*
* @hide
*/
public static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE =
"android.media.action.STILL_IMAGE_CAMERA_SECURE";
/** /**
* The name of the Intent action used to launch a camera in video mode. * The name of the Intent action used to launch a camera in video mode.
*/ */