Commit 4c4cabdf by ibaker Committed by Oliver Woodman

(partial) Rollback of…

(partial) Rollback of https://github.com/google/ExoPlayer/commit/880b879e8c55b1e709fd3ed6a48005737d26e75a

*** Original commit ***

Suppress warnings emitted by Checker Framework version 2.11.1

More information:
https://docs.google.com/document/d/16tpK6aXqN68PvTyvt4siM-m7f0NXi_8xEeitLDzr8xY/edit?usp=sharing

Tested:
    TAP train for global presubmit queue
    http://test/OCL:278152710:BASE:278144052:1572760370662:22459c12

***

PiperOrigin-RevId: 284738438
parent 90329a14
...@@ -688,8 +688,6 @@ public final class MediaSessionConnector { ...@@ -688,8 +688,6 @@ public final class MediaSessionConnector {
* @param customActionProviders The custom action providers, or null to remove all existing custom * @param customActionProviders The custom action providers, or null to remove all existing custom
* action providers. * action providers.
*/ */
// incompatible types in assignment.
@SuppressWarnings("nullness:assignment.type.incompatible")
public void setCustomActionProviders(@Nullable CustomActionProvider... customActionProviders) { public void setCustomActionProviders(@Nullable CustomActionProvider... customActionProviders) {
this.customActionProviders = this.customActionProviders =
customActionProviders == null ? new CustomActionProvider[0] : customActionProviders; customActionProviders == null ? new CustomActionProvider[0] : customActionProviders;
......
...@@ -24,7 +24,6 @@ import java.nio.ByteBuffer; ...@@ -24,7 +24,6 @@ import java.nio.ByteBuffer;
* An {@link AudioProcessor} that applies a mapping from input channels onto specified output * An {@link AudioProcessor} that applies a mapping from input channels onto specified output
* channels. This can be used to reorder, duplicate or discard channels. * channels. This can be used to reorder, duplicate or discard channels.
*/ */
@SuppressWarnings("nullness:initialization.fields.uninitialized")
/* package */ final class ChannelMappingAudioProcessor extends BaseAudioProcessor { /* package */ final class ChannelMappingAudioProcessor extends BaseAudioProcessor {
@Nullable private int[] pendingOutputChannels; @Nullable private int[] pendingOutputChannels;
......
...@@ -339,8 +339,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -339,8 +339,6 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
new DefaultLoadErrorHandlingPolicy(initialDrmRequestRetryCount)); new DefaultLoadErrorHandlingPolicy(initialDrmRequestRetryCount));
} }
// the constructor does not initialize fields: offlineLicenseKeySetId
@SuppressWarnings("nullness:initialization.fields.uninitialized")
private DefaultDrmSessionManager( private DefaultDrmSessionManager(
UUID uuid, UUID uuid,
ExoMediaDrm.Provider<T> exoMediaDrmProvider, ExoMediaDrm.Provider<T> exoMediaDrmProvider,
......
...@@ -129,8 +129,6 @@ public final class Track { ...@@ -129,8 +129,6 @@ public final class Track {
: sampleDescriptionEncryptionBoxes[sampleDescriptionIndex]; : sampleDescriptionEncryptionBoxes[sampleDescriptionIndex];
} }
// incompatible types in argument.
@SuppressWarnings("nullness:argument.type.incompatible")
public Track copyWithFormat(Format format) { public Track copyWithFormat(Format format) {
return new Track( return new Track(
id, id,
......
...@@ -943,8 +943,6 @@ public final class MediaCodecUtil { ...@@ -943,8 +943,6 @@ public final class MediaCodecUtil {
@Nullable private android.media.MediaCodecInfo[] mediaCodecInfos; @Nullable private android.media.MediaCodecInfo[] mediaCodecInfos;
// the constructor does not initialize fields: mediaCodecInfos
@SuppressWarnings("nullness:initialization.fields.uninitialized")
public MediaCodecListCompatV21(boolean includeSecure, boolean includeTunneling) { public MediaCodecListCompatV21(boolean includeSecure, boolean includeTunneling) {
codecKind = codecKind =
includeSecure || includeTunneling includeSecure || includeTunneling
...@@ -958,8 +956,6 @@ public final class MediaCodecUtil { ...@@ -958,8 +956,6 @@ public final class MediaCodecUtil {
return mediaCodecInfos.length; return mediaCodecInfos.length;
} }
// incompatible types in return.
@SuppressWarnings("nullness:return.type.incompatible")
@Override @Override
public android.media.MediaCodecInfo getCodecInfoAt(int index) { public android.media.MediaCodecInfo getCodecInfoAt(int index) {
ensureMediaCodecInfosInitialized(); ensureMediaCodecInfosInitialized();
......
...@@ -302,8 +302,6 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex { ...@@ -302,8 +302,6 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
} }
} }
// incompatible types in argument.
@SuppressWarnings("nullness:argument.type.incompatible")
private Cursor getCursor(String selection, @Nullable String[] selectionArgs) private Cursor getCursor(String selection, @Nullable String[] selectionArgs)
throws DatabaseIOException { throws DatabaseIOException {
try { try {
......
...@@ -383,8 +383,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -383,8 +383,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@Nullable private byte[] sampleData; @Nullable private byte[] sampleData;
// the constructor does not initialize fields: sampleData
@SuppressWarnings("nullness:initialization.fields.uninitialized")
public SourceLoadable(DataSpec dataSpec, DataSource dataSource) { public SourceLoadable(DataSpec dataSpec, DataSource dataSource) {
this.dataSpec = dataSpec; this.dataSpec = dataSpec;
this.dataSource = new StatsDataSource(dataSource); this.dataSource = new StatsDataSource(dataSource);
......
...@@ -610,18 +610,13 @@ public class AdaptiveTrackSelection extends BaseTrackSelection { ...@@ -610,18 +610,13 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
@Nullable private long[][] allocationCheckpoints; @Nullable private long[][] allocationCheckpoints;
/* package */ /* package */ DefaultBandwidthProvider(
// the constructor does not initialize fields: allocationCheckpoints
@SuppressWarnings("nullness:initialization.fields.uninitialized")
DefaultBandwidthProvider(
BandwidthMeter bandwidthMeter, float bandwidthFraction, long reservedBandwidth) { BandwidthMeter bandwidthMeter, float bandwidthFraction, long reservedBandwidth) {
this.bandwidthMeter = bandwidthMeter; this.bandwidthMeter = bandwidthMeter;
this.bandwidthFraction = bandwidthFraction; this.bandwidthFraction = bandwidthFraction;
this.reservedBandwidth = reservedBandwidth; this.reservedBandwidth = reservedBandwidth;
} }
// unboxing a possibly-null reference allocationCheckpoints[nextIndex][0]
@SuppressWarnings("nullness:unboxing.of.nullable")
@Override @Override
public long getAllocatedBandwidth() { public long getAllocatedBandwidth() {
long totalBandwidth = (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction); long totalBandwidth = (long) (bandwidthMeter.getBitrateEstimate() * bandwidthFraction);
......
...@@ -36,8 +36,6 @@ public final class DataSchemeDataSource extends BaseDataSource { ...@@ -36,8 +36,6 @@ public final class DataSchemeDataSource extends BaseDataSource {
private int endPosition; private int endPosition;
private int readPosition; private int readPosition;
// the constructor does not initialize fields: data
@SuppressWarnings("nullness:initialization.fields.uninitialized")
public DataSchemeDataSource() { public DataSchemeDataSource() {
super(/* isNetwork= */ false); super(/* isNetwork= */ false);
} }
......
...@@ -60,8 +60,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -60,8 +60,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
// Methods called on any thread. // Methods called on any thread.
// the constructor does not initialize fields: lastProjectionData
@SuppressWarnings("nullness:initialization.fields.uninitialized")
public SceneRenderer() { public SceneRenderer() {
frameAvailable = new AtomicBoolean(); frameAvailable = new AtomicBoolean();
resetRotationAtNextFrame = new AtomicBoolean(true); resetRotationAtNextFrame = new AtomicBoolean(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment