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

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

Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev

parents 799553e0 e590dc6f

api/current.txt

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

core/java/android/provider/MediaStore.java

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