sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove a suppression introduced by the checker-framework 3.3.0 upgrade

Browse source 
Update the comment on a suppression of Field.get(null) which is safe
but blocked by the checker.

These suppressions were introduced in d1e0572448

PiperOrigin-RevId: 307036441
This commit is contained in:
ibaker 2020-04-17 15:02:04 +01:00 committed by Oliver Woodman
parent ca2105d50c
commit ece8d22357
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
View file

@ -166,7 +166,7 @@ public final class CronetEngineWrapper {
private final boolean preferGMSCoreCronet; private final boolean preferGMSCoreCronet;
// Multi-catch can only be used for API 19+ in this case. // Multi-catch can only be used for API 19+ in this case.
// incompatible types in argument. // Field#get(null) is blocked by the null-checker, but is safe because the field is static.
@SuppressWarnings({"UseMultiCatch", "nullness:argument.type.incompatible"}) @SuppressWarnings({"UseMultiCatch", "nullness:argument.type.incompatible"})
public CronetProviderComparator(boolean preferGMSCoreCronet) { public CronetProviderComparator(boolean preferGMSCoreCronet) {
// GMSCore CronetProvider classes are only available in some configurations. // GMSCore CronetProvider classes are only available in some configurations.

6
library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java
View file

@ -96,8 +96,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
return Assertions.checkNotNull(trackGroups); return Assertions.checkNotNull(trackGroups);
} }
// unboxing a possibly-null reference streamPeriodIndices.get(streams[i])
@SuppressWarnings("nullness:unboxing.of.nullable")
@Override @Override
public long selectTracks( public long selectTracks(
@NullableType TrackSelection[] selections, @NullableType TrackSelection[] selections,
@ -109,8 +107,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
int[] streamChildIndices = new int[selections.length]; int[] streamChildIndices = new int[selections.length];
int[] selectionChildIndices = new int[selections.length]; int[] selectionChildIndices = new int[selections.length];
for (int i = 0; i < selections.length; i++) { for (int i = 0; i < selections.length; i++) {
streamChildIndices[i] = streams[i] == null ? C.INDEX_UNSET Integer streamChildIndex = streams[i] == null ? null : streamPeriodIndices.get(streams[i]);
: streamPeriodIndices.get(streams[i]); streamChildIndices[i] = streamChildIndex == null ? C.INDEX_UNSET : streamChildIndex;
selectionChildIndices[i] = C.INDEX_UNSET; selectionChildIndices[i] = C.INDEX_UNSET;
if (selections[i] != null) { if (selections[i] != null) {
TrackGroup trackGroup = selections[i].getTrackGroup(); TrackGroup trackGroup = selections[i].getTrackGroup();