diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-09-10 00:48:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 00:48:26 -0700 |
| commit | 753e1280cbc3f0006b04f67385f02e1f92019f7d (patch) | |
| tree | ce54912968d860771f437d3e0a70762df0474c92 /core/java/android | |
| parent | 799553e02aa3350397d723982d42198a5bab774c (diff) | |
| parent | e590dc6f7dfbd00117acfb7aa2ef35bc94e537bd (diff) | |
| download | frameworks_base-753e1280cbc3f0006b04f67385f02e1f92019f7d.zip frameworks_base-753e1280cbc3f0006b04f67385f02e1f92019f7d.tar.gz frameworks_base-753e1280cbc3f0006b04f67385f02e1f92019f7d.tar.bz2 | |
Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 48d84c1..3c2d164 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"; |