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

Commit 2dc7c6c4 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
parents faf9a783 e02a63f0

api/current.xml

+11 −0
Original line number Original line Diff line number Diff line
@@ -131660,6 +131660,17 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</field>

<field name="MEDIA_IGNORE_FILENAME"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;.nomedia&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="MEDIA_SCANNER_VOLUME"

<field name="MEDIA_SCANNER_VOLUME"

 type="java.lang.String"

 type="java.lang.String"

 transient="false"

 transient="false"

core/java/android/provider/MediaStore.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -1819,4 +1819,12 @@ public final class MediaStore { 
     * Name of current volume being scanned by the media scanner.

     * Name of current volume being scanned by the media scanner.

     */

     */

    public static final String MEDIA_SCANNER_VOLUME = "volume";

    public static final String MEDIA_SCANNER_VOLUME = "volume";



    /**

     * Name of the file signaling the media scanner to ignore media in the containing directory

     * and its subdirectories. Developers should use this to avoid application graphics showing

     * up in the Gallery and likewise prevent application sounds and music from showing up in

     * the Music app.

     */

    public static final String MEDIA_IGNORE_FILENAME = ".nomedia";

}
 
}