From e590dc6f7dfbd00117acfb7aa2ef35bc94e537bd Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Fri, 7 Sep 2012 19:02:34 +0800 Subject: [PATCH] Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE. bug:7053266 Change-Id: I4e00199598f57f11250abeab4ce17ced18f41f14 --- api/current.txt | 1 + core/java/android/provider/MediaStore.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 4a994271dc007..508f9b2ca4e11 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18377,6 +18377,7 @@ package android.provider { field public static final java.lang.String INTENT_ACTION_MEDIA_SEARCH = "android.intent.action.MEDIA_SEARCH"; field public static final deprecated java.lang.String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER"; field public static final java.lang.String INTENT_ACTION_STILL_IMAGE_CAMERA = "android.media.action.STILL_IMAGE_CAMERA"; + field public static final java.lang.String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE = "android.media.action.STILL_IMAGE_CAMERA_SECURE"; field public static final java.lang.String INTENT_ACTION_VIDEO_CAMERA = "android.media.action.VIDEO_CAMERA"; field public static final java.lang.String MEDIA_IGNORE_FILENAME = ".nomedia"; field public static final java.lang.String MEDIA_SCANNER_VOLUME = "volume"; diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 48d84c14c9bd5..3c2d1643438d1 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -183,8 +183,6 @@ public final class MediaStore { * 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";