diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-09-23 02:21:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-23 02:21:17 -0700 |
| commit | 29f5230dc604537a72842a70991bae71019f8c80 (patch) | |
| tree | 9a34e17bfe6e5c6f0f3e5e65c6f2ef02d8700023 /api/current.txt | |
| parent | c4b16f1acb3b81c7bdee36b48de01cd5d7a96d5b (diff) | |
| parent | edc1a2bbc545a50f98ee8c9409c1861fe3522b11 (diff) | |
| download | frameworks_base-29f5230dc604537a72842a70991bae71019f8c80.zip frameworks_base-29f5230dc604537a72842a70991bae71019f8c80.tar.gz frameworks_base-29f5230dc604537a72842a70991bae71019f8c80.tar.bz2 | |
Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index df5429d..babeb6c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18416,6 +18416,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"; |