summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-09-21 19:02:43 +0800
committerWu-cheng Li <wuchengli@google.com>2012-09-21 19:04:24 +0800
commitedc1a2bbc545a50f98ee8c9409c1861fe3522b11 (patch)
tree3c5d30507be31a28aea668c0bf9c271afcecca72
parent7566abd305a2b3060ae541055ed04f087f5266ec (diff)
downloadframeworks_base-edc1a2bbc545a50f98ee8c9409c1861fe3522b11.zip
frameworks_base-edc1a2bbc545a50f98ee8c9409c1861fe3522b11.tar.gz
frameworks_base-edc1a2bbc545a50f98ee8c9409c1861fe3522b11.tar.bz2
Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
bug:7141738 Change-Id: If0109671a072e978501e238fe3d7554693a92157
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/provider/MediaStore.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 2381732..31ac9fe 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18411,6 +18411,7 @@ package android.provider {
method public static android.net.Uri getMediaScannerUri();
method public static java.lang.String getVersion(android.content.Context);
field public static final java.lang.String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
+ field public static final java.lang.String ACTION_IMAGE_CAPTURE_SECURE = "android.media.action.IMAGE_CAPTURE_SECURE";
field public static final java.lang.String ACTION_VIDEO_CAPTURE = "android.media.action.VIDEO_CAPTURE";
field public static final java.lang.String AUTHORITY = "media";
field public static final java.lang.String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index cfa5479..4a56535 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -223,7 +223,6 @@ public final class MediaStore {
*
* @see #ACTION_IMAGE_CAPTURE
* @see #EXTRA_OUTPUT
- * @hide
*/
public static final String ACTION_IMAGE_CAPTURE_SECURE =
"android.media.action.IMAGE_CAPTURE_SECURE";