From 9bde5d0351d3a1a62527bae2270a8f6f9c5b866e Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 21 Oct 2020 16:27:28 +0100 Subject: [PATCH] [nullness] The nullness checking fixes of the media related files We rolled back the previous because some of the nullness checking fixes broke the exoplayer2 tests. We submit this CL into the TAP Global Presubmit train (https://test.corp.google.com/OCL:337620582:BASE:338201100:1603283151742:36afd5a5) and make sure that this CL wouldn't break any other tests on google3. PiperOrigin-RevId: 338267548 --- .../exoplayer2/ext/cast/DefaultMediaItemConverter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java index 705f2c2508..c72a1fb316 100644 --- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java +++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultMediaItemConverter.java @@ -45,7 +45,9 @@ public final class DefaultMediaItemConverter implements MediaItemConverter { @Override public MediaItem toMediaItem(MediaQueueItem item) { // `item` came from `toMediaQueueItem()` so the custom JSON data must be set. - return getMediaItem(Assertions.checkNotNull(item.getMedia().getCustomData())); + MediaInfo mediaInfo = item.getMedia(); + Assertions.checkNotNull(mediaInfo); + return getMediaItem(Assertions.checkNotNull(mediaInfo.getCustomData())); } @Override