Snap for 6667917 from 68d4476823da113fe879173d06b10c1f0a8721cb to rvc-d1-release
Change-Id: Iaca005bb357c82168cec2417d335197e55b59f35
diff --git a/car-media-common/src/com/android/car/media/common/browse/BrowsedMediaItems.java b/car-media-common/src/com/android/car/media/common/browse/BrowsedMediaItems.java
index d46f027..f93be0a 100644
--- a/car-media-common/src/com/android/car/media/common/browse/BrowsedMediaItems.java
+++ b/car-media-common/src/com/android/car/media/common/browse/BrowsedMediaItems.java
@@ -26,6 +26,7 @@
import com.android.car.media.common.MediaItemMetadata;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -146,6 +147,7 @@
mHandler.removeCallbacks(mRetryRunnable);
mIsDataLoaded = true;
setValue(children.stream()
+ .filter(Objects::nonNull)
.map(MediaItemMetadata::new)
.collect(Collectors.toList()));
}
diff --git a/car-media-common/src/com/android/car/media/common/browse/SearchedMediaItems.java b/car-media-common/src/com/android/car/media/common/browse/SearchedMediaItems.java
index 5399e06..b8c7423 100644
--- a/car-media-common/src/com/android/car/media/common/browse/SearchedMediaItems.java
+++ b/car-media-common/src/com/android/car/media/common/browse/SearchedMediaItems.java
@@ -28,6 +28,7 @@
import com.android.car.media.common.MediaItemMetadata;
import java.util.List;
+import java.util.Objects;
/**
* A LiveData that provides access to a MediaBrowser's search results for a given query
@@ -43,7 +44,10 @@
public void onSearchResult(@NonNull String query, Bundle extras,
@NonNull List<MediaBrowserCompat.MediaItem> items) {
super.onSearchResult(query, extras, items);
- setValue(items.stream().map(MediaItemMetadata::new).collect(toList()));
+ setValue(items.stream()
+ .filter(Objects::nonNull)
+ .map(MediaItemMetadata::new)
+ .collect(toList()));
}
@Override
diff --git a/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java b/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
index 02583c7..bcb9893 100644
--- a/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
+++ b/car-media-common/src/com/android/car/media/common/playback/PlaybackViewModel.java
@@ -303,7 +303,8 @@
public void onQueueChanged(@Nullable List<MediaSessionCompat.QueueItem> queue) {
List<MediaItemMetadata> filtered = queue == null ? Collections.emptyList()
: queue.stream()
- .filter(item -> item.getDescription() != null
+ .filter(item -> item != null
+ && item.getDescription() != null
&& item.getDescription().getTitle() != null)
.map(MediaItemMetadata::new)
.collect(Collectors.toList());
