Snap for 5778854 from 515d8c6da9da6ac44308e51332daf48816605190 to qt-c2f2-release

Change-Id: Ie479754bbca857975c72d8457b602d2e31bf6a3d
diff --git a/src/com/android/car/media/localmediaplayer/DataModel.java b/src/com/android/car/media/localmediaplayer/DataModel.java
index 1b94855..3d4ee2f 100644
--- a/src/com/android/car/media/localmediaplayer/DataModel.java
+++ b/src/com/android/car/media/localmediaplayer/DataModel.java
@@ -205,8 +205,7 @@
                 .setResolver(mResolver)
                 .setResult(result);
 
-        Uri[] uri = null;
-        if (lastCategory.equals(LocalMediaBrowserService.GENRES_ID)) {
+        if (LocalMediaBrowserService.GENRES_ID.equals(lastCategory)) {
             // Genres come from a different table and don't use the where clause from the
             // usual media table so we need to have this condition.
             try {