diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-10 01:36:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-10 01:36:10 +0000 |
| commit | 610b0f912870c40981de861c38e5181e92c7027d (patch) | |
| tree | 89fb23f233a185c3f22ef6e83fb84a5ad82e9496 | |
| parent | d51f181470ef66fed1187429ec2e1ef1b8cd678b (diff) | |
| parent | 367a30ea44a5bcd21e42aee26edf6a86a35b2d9f (diff) | |
| download | platform_packages_apps_Car_libs-android11-gsi.tar.gz platform_packages_apps_Car_libs-android11-gsi.tar.bz2 platform_packages_apps_Car_libs-android11-gsi.zip | |
Snap for 6668007 from 90af014678cbd64b82c9f398f5677e3490c4d8d4 to rvc-release am: 367a30ea44android11-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/libs/+/12123752
Change-Id: I628bd095ac3d969993f175d1849c95b3bd7fb1bd
3 files changed, 9 insertions, 2 deletions
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 d46f027c..f93be0a6 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 androidx.lifecycle.LiveData; import com.android.car.media.common.MediaItemMetadata; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -146,6 +147,7 @@ class BrowsedMediaItems extends LiveData<List<MediaItemMetadata>> { 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 5399e06a..b8c74236 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 androidx.lifecycle.LiveData; 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 class SearchedMediaItems extends LiveData<List<MediaItemMetadata>> { 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 02583c78..bcb98934 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 class PlaybackViewModel extends AndroidViewModel { 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()); |