Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7a4d856c: Merge "Removed offensive music genre"

Browse Source 
* commit '7a4d856c881ef48ad590d9e5a0456c94d188898a':
  Removed offensive music genre
This commit is contained in:
Marco Nelissen
2012-11-05 15:41:31 -08:00
committed by Android Git Automerger
parent 861a1b8079 7a4d856c88
commit 6791ebde5f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/MediaScanner.java
View File

@@ -283,7 +283,7 @@ public class MediaScanner
"Terror", "Terror",
"Indie", "Indie",
"Britpop", "Britpop",
"Negerpunk", null,
"Polsk Punk", "Polsk Punk",
"Beat", "Beat",
"Christian Gangsta", "Christian Gangsta",
@@ -700,7 +700,7 @@ public class MediaScanner
try { try {
short genreIndex = Short.parseShort(number.toString()); short genreIndex = Short.parseShort(number.toString());
if (genreIndex >= 0) { if (genreIndex >= 0) {
if (genreIndex < ID3_GENRES.length) { if (genreIndex < ID3_GENRES.length && ID3_GENRES[genreIndex] != null) {
return ID3_GENRES[genreIndex]; return ID3_GENRES[genreIndex];
} else if (genreIndex == 0xFF) { } else if (genreIndex == 0xFF) {
return null; return null;