summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorYabin Huang <yabinh@google.com>2019-07-29 16:51:15 -0700
committerYabin Huang <yabinh@google.com>2019-07-31 22:52:43 +0000
commit384d0e331ff71a7a29e41d1928b45fb73f15afe2 (patch)
treeb18d9ef57da440d2dfed7fe1686b7aed5d2cc36f /src/com
parenta7383213be0357092846ff0fce087e2ac2f8ab3b (diff)
downloadplatform_packages_apps_Car_LocalMediaPlayer-384d0e331ff71a7a29e41d1928b45fb73f15afe2.tar.gz
platform_packages_apps_Car_LocalMediaPlayer-384d0e331ff71a7a29e41d1928b45fb73f15afe2.tar.bz2
platform_packages_apps_Car_LocalMediaPlayer-384d0e331ff71a7a29e41d1928b45fb73f15afe2.zip
Fix a crash when equals() is called on null String
Fixes: 138448649 Test: manual Change-Id: I4eda9f8e1bef72f83959b317fec900a1c243a51f
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/car/media/localmediaplayer/DataModel.java3
1 files changed, 1 insertions, 2 deletions
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 @@ public class DataModel {
.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 {