Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29f5230d authored by Wu-cheng Li's avatar Wu-cheng Li Committed by Android (Google) Code Review
Browse files

Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev

parents c4b16f1a edc1a2bb

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/provider/MediaStore.java

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,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";