summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-19 09:20:22 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-05-19 09:20:22 -0700
commit2dc7c6c4153380fc64b99d37d763d3f0d1cac04d (patch)
tree806ce47e9628fdff95da21144b6be2ef53f6f8f8 /core
parentfaf9a78363b0c773b95c9b43263d788aee313054 (diff)
parente02a63f012b69ce60a94de5980a1c615b26ff9c5 (diff)
downloadframeworks_base-2dc7c6c4153380fc64b99d37d763d3f0d1cac04d.zip
frameworks_base-2dc7c6c4153380fc64b99d37d763d3f0d1cac04d.tar.gz
frameworks_base-2dc7c6c4153380fc64b99d37d763d3f0d1cac04d.tar.bz2
merge from open-source master
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/MediaStore.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index c9d125b..40ed980 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -1819,4 +1819,12 @@ public final class MediaStore {
* Name of current volume being scanned by the media scanner.
*/
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";
}