diff options
| author | 2012-09-10 00:48:25 -0700 | |
|---|---|---|
| committer | 2012-09-10 00:48:26 -0700 | |
| commit | 753e1280cbc3f0006b04f67385f02e1f92019f7d (patch) | |
| tree | ce54912968d860771f437d3e0a70762df0474c92 | |
| parent | 799553e02aa3350397d723982d42198a5bab774c (diff) | |
| parent | e590dc6f7dfbd00117acfb7aa2ef35bc94e537bd (diff) | |
Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index f975bf89caea..c1d8c9e86ee3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18384,6 +18384,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 48d84c14c9bd..3c2d1643438d 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"; |