Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6791ebde authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 7a4d856c: Merge "Removed offensive music genre" 

* commit '7a4d856c':
  Removed offensive music genre
parents 861a1b80 7a4d856c

media/java/android/media/MediaScanner.java

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ public class MediaScanner 
        "Terror",

        "Indie",

        "Britpop",

        "Negerpunk",

        null,

        "Polsk Punk",

        "Beat",

        "Christian Gangsta",
@@ -700,7 +700,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;