diff options
| author | 2012-08-29 12:16:30 +0200 | |
|---|---|---|
| committer | 2012-08-31 10:47:26 +0200 | |
| commit | c3ea477e2111f199d10341b121791cb2ec91eca3 (patch) | |
| tree | c1fc7d7f5b82f630f6d2a3c4400f9d2106d31471 | |
| parent | 0dab1a198e19c9993897b031d425a61a3bfec562 (diff) | |
Removed offensive music genre
The genre is a bad joke, not a real thing.
See http://en.wikipedia.org/wiki/Negerpunk
Change-Id: I073c89e286ef4b8f9d678e1b137c657b26066099
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 6f8b809f82ff..a37d8b35ddbf 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; |