summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media/java/android/media/MediaScanner.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index fd37bcf..5dfc735 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -283,7 +283,7 @@ public class MediaScanner
"Terror",
"Indie",
"Britpop",
- "Negerpunk",
+ null,
"Polsk Punk",
"Beat",
"Christian Gangsta",
@@ -683,7 +683,7 @@ public class MediaScanner
try {
short genreIndex = Short.parseShort(number.toString());
if (genreIndex >= 0) {
- if (genreIndex < ID3_GENRES.length) {
+ if (genreIndex < ID3_GENRES.length && ID3_GENRES[genreIndex] != null) {
return ID3_GENRES[genreIndex];
} else if (genreIndex == 0xFF) {
return null;