Merge "Removed offensive music genre"

2012-11-05 14:50:08 -08:00
parent 7e007ff837 c3ea477e21
commit 7a4d856c88
1 changed files with 2 additions and 2 deletions
--- 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;