Keep method signature together when overriding

Not important, but when overriding a method that can return null,
it seems preferable to put @Override first, followed by what it's
overriding (which includes the @Nullable).

Also remove explicit @NonNull use in the core library. @NonNull is
propagated by default, so this is redundant.

PiperOrigin-RevId: 296188379

extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java

@@ -88,8 +88,8 @@ import java.nio.ByteBuffer;
     return new VideoDecoderOutputBuffer(this::releaseOutputBuffer);
   }
 
-  @Nullable
   @Override
+  @Nullable
   protected Gav1DecoderException decode(
       VideoDecoderInputBuffer inputBuffer, VideoDecoderOutputBuffer outputBuffer, boolean reset) {
     ByteBuffer inputData = Util.castNonNull(inputBuffer.data);

library/core/src/main/java/com/google/android/exoplayer2/drm/DummyExoMediaDrm.java

@@ -64,8 +64,8 @@ public final class DummyExoMediaDrm<T extends ExoMediaCrypto> implements ExoMedi
     throw new IllegalStateException();
   }
 
-  @Nullable
   @Override
+  @Nullable
   public byte[] provideKeyResponse(byte[] scope, byte[] response) {
     // Should not be invoked. No session should exist.
     throw new IllegalStateException();

library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java

@@ -179,8 +179,8 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
     return new KeyRequest(requestData, licenseServerUrl);
   }
 
-  @Nullable
   @Override
+  @Nullable
   public byte[] provideKeyResponse(byte[] scope, byte[] response)
       throws NotProvisionedException, DeniedByServerException {
     if (C.CLEARKEY_UUID.equals(uuid)) {

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecBufferEnqueuer.java

@@ -21,7 +21,6 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
 import androidx.annotation.GuardedBy;
-import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
@@ -86,7 +85,7 @@ class AsynchronousMediaCodecBufferEnqueuer implements MediaCodecInputBufferEnque
       handler =
           new Handler(handlerThread.getLooper()) {
             @Override
-            public void handleMessage(@NonNull Message msg) {
+            public void handleMessage(Message msg) {
               doHandleMessage(msg);
             }
           };

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/DedicatedThreadAsyncMediaCodecAdapter.java

@@ -21,7 +21,6 @@ import android.media.MediaFormat;
 import android.os.Handler;
 import android.os.HandlerThread;
 import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
@@ -184,25 +183,23 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   }
 
   @Override
-  public synchronized void onInputBufferAvailable(@NonNull MediaCodec codec, int index) {
+  public synchronized void onInputBufferAvailable(MediaCodec codec, int index) {
     mediaCodecAsyncCallback.onInputBufferAvailable(codec, index);
   }
 
   @Override
   public synchronized void onOutputBufferAvailable(
-      @NonNull MediaCodec codec, int index, @NonNull MediaCodec.BufferInfo info) {
+      MediaCodec codec, int index, MediaCodec.BufferInfo info) {
     mediaCodecAsyncCallback.onOutputBufferAvailable(codec, index, info);
   }
 
   @Override
-  public synchronized void onError(
+  public synchronized void onError(MediaCodec codec, MediaCodec.CodecException e) {
-      @NonNull MediaCodec codec, @NonNull MediaCodec.CodecException e) {
     mediaCodecAsyncCallback.onError(codec, e);
   }
 
   @Override
-  public synchronized void onOutputFormatChanged(
+  public synchronized void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
-      @NonNull MediaCodec codec, @NonNull MediaFormat format) {
     mediaCodecAsyncCallback.onOutputFormatChanged(codec, format);
   }
 

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAsyncCallback.java

@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.mediacodec;
 
 import android.media.MediaCodec;
 import android.media.MediaFormat;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
@@ -120,25 +119,24 @@ import java.util.ArrayDeque;
   }
 
   @Override
-  public void onInputBufferAvailable(@NonNull MediaCodec mediaCodec, int i) {
+  public void onInputBufferAvailable(MediaCodec mediaCodec, int i) {
     availableInputBuffers.add(i);
   }
 
   @Override
   public void onOutputBufferAvailable(
-      @NonNull MediaCodec mediaCodec, int i, @NonNull MediaCodec.BufferInfo bufferInfo) {
+      MediaCodec mediaCodec, int i, MediaCodec.BufferInfo bufferInfo) {
     availableOutputBuffers.add(i);
     bufferInfos.add(bufferInfo);
   }
 
   @Override
-  public void onError(@NonNull MediaCodec mediaCodec, @NonNull MediaCodec.CodecException e) {
+  public void onError(MediaCodec mediaCodec, MediaCodec.CodecException e) {
     onMediaCodecError(e);
   }
 
   @Override
-  public void onOutputFormatChanged(
+  public void onOutputFormatChanged(MediaCodec mediaCodec, MediaFormat mediaFormat) {
-      @NonNull MediaCodec mediaCodec, @NonNull MediaFormat mediaFormat) {
     availableOutputBuffers.add(MediaCodec.INFO_OUTPUT_FORMAT_CHANGED);
     formats.add(mediaFormat);
   }

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MultiLockAsyncMediaCodecAdapter.java

@@ -22,7 +22,6 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
@@ -295,15 +294,14 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   // Called by the internal thread.
 
   @Override
-  public void onInputBufferAvailable(@NonNull MediaCodec codec, int index) {
+  public void onInputBufferAvailable(MediaCodec codec, int index) {
     synchronized (inputBufferLock) {
       availableInputBuffers.add(index);
     }
   }
 
   @Override
-  public void onOutputBufferAvailable(
+  public void onOutputBufferAvailable(MediaCodec codec, int index, MediaCodec.BufferInfo info) {
-      @NonNull MediaCodec codec, int index, @NonNull MediaCodec.BufferInfo info) {
     synchronized (outputBufferLock) {
       availableOutputBuffers.add(index);
       bufferInfos.add(info);
@@ -311,12 +309,12 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   }
 
   @Override
-  public void onError(@NonNull MediaCodec codec, @NonNull MediaCodec.CodecException e) {
+  public void onError(MediaCodec codec, MediaCodec.CodecException e) {
     onMediaCodecError(e);
   }
 
   @Override
-  public void onOutputFormatChanged(@NonNull MediaCodec codec, @NonNull MediaFormat format) {
+  public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
     synchronized (outputBufferLock) {
       availableOutputBuffers.add(MediaCodec.INFO_OUTPUT_FORMAT_CHANGED);
       formats.add(format);

library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java

@@ -1156,8 +1156,8 @@ public final class DownloadHelper {
       return C.SELECTION_REASON_UNKNOWN;
     }
 
-    @Nullable
     @Override
+    @Nullable
     public Object getSelectionData() {
       return null;
     }
@@ -1180,8 +1180,8 @@ public final class DownloadHelper {
       return 0;
     }
 
-    @Nullable
     @Override
+    @Nullable
     public TransferListener getTransferListener() {
       return null;
     }

library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadService.java

@@ -693,8 +693,8 @@ public abstract class DownloadService extends Service {
   /**
    * Throws {@link UnsupportedOperationException} because this service is not designed to be bound.
    */
-  @Nullable
   @Override
+  @Nullable
   public final IBinder onBind(Intent intent) {
     throw new UnsupportedOperationException();
   }

library/core/src/main/java/com/google/android/exoplayer2/source/IcyDataSource.java

@@ -91,8 +91,8 @@ import java.util.Map;
     return bytesRead;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public Uri getUri() {
     return upstream.getUri();
   }

library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java

@@ -71,8 +71,8 @@ public final class LoopingMediaSource extends CompositeMediaSource<Void> {
     return maskingMediaSource.getTag();
   }
 
-  @Nullable
   @Override
+  @Nullable
   public Timeline getInitialTimeline() {
     return loopCount != Integer.MAX_VALUE
         ? new LoopingTimeline(maskingMediaSource.getTimeline(), loopCount)

library/core/src/main/java/com/google/android/exoplayer2/source/MaskingMediaSource.java

@@ -83,8 +83,8 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
-  @Nullable
   @Override
+  @Nullable
   public Object getTag() {
     return mediaSource.getTag();
   }
@@ -196,8 +196,8 @@ public final class MaskingMediaSource extends CompositeMediaSource<Void> {
     }
   }
 
-  @Nullable
   @Override
+  @Nullable
   protected MediaPeriodId getMediaPeriodIdForChildMediaPeriodId(
       Void id, MediaPeriodId mediaPeriodId) {
     return mediaPeriodId.copyWithPeriodUid(getExternalPeriodUid(mediaPeriodId.periodUid));

library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java

@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.text.cea;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
@@ -185,7 +184,7 @@ import java.util.PriorityQueue;
     private long queuedInputBufferCount;
 
     @Override
-    public int compareTo(@NonNull CeaInputBuffer other) {
+    public int compareTo(CeaInputBuffer other) {
       if (isEndOfStream() != other.isEndOfStream()) {
         return isEndOfStream() ? 1 : -1;
       }

library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java

@@ -35,7 +35,6 @@ import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
 import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.span.HorizontalTextInVerticalContextSpan;
@@ -866,7 +865,7 @@ public final class WebvttCueParser {
     }
 
     @Override
-    public int compareTo(@NonNull StyleMatch another) {
+    public int compareTo(StyleMatch another) {
       return this.score - another.score;
     }
 

library/core/src/main/java/com/google/android/exoplayer2/upstream/ResolvingDataSource.java

@@ -110,8 +110,8 @@ public final class ResolvingDataSource implements DataSource {
     return upstreamDataSource.read(buffer, offset, readLength);
   }
 
-  @Nullable
   @Override
+  @Nullable
   public Uri getUri() {
     @Nullable Uri reportedUri = upstreamDataSource.getUri();
     return reportedUri == null ? null : resolver.resolveReportedUri(reportedUri);

library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java

@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.File;
@@ -95,7 +94,7 @@ public class CacheSpan implements Comparable<CacheSpan> {
   }
 
   @Override
-  public int compareTo(@NonNull CacheSpan another) {
+  public int compareTo(CacheSpan another) {
     if (!key.equals(another.key)) {
       return key.compareTo(another.key);
     }

library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java

@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.extractor.ChunkIndex;
 import com.google.android.exoplayer2.util.Log;
@@ -196,7 +195,7 @@ public final class CachedRegionTracker implements Cache.Listener {
     }
 
     @Override
-    public int compareTo(@NonNull Region another) {
+    public int compareTo(Region another) {
       return Util.compareLong(startOffset, another.startOffset);
     }
 

library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.os.ConditionVariable;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 import com.google.android.exoplayer2.C;
@@ -332,7 +331,6 @@ public final class SimpleCache implements Cache {
     }
   }
 
-  @NonNull
   @Override
   public synchronized NavigableSet<CacheSpan> getCachedSpans(String key) {
     Assertions.checkState(!released);

library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java

@@ -3291,8 +3291,8 @@ public final class ExoPlayerTest {
             return false;
           }
 
-          @Nullable
           @Override
+          @Nullable
           public Timeline getInitialTimeline() {
             return Timeline.EMPTY;
           }

library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java

@@ -130,8 +130,8 @@ public class DownloadServiceDashTest {
                   return dashDownloadManager;
                 }
 
-                @Nullable
                 @Override
+                @Nullable
                 protected Scheduler getScheduler() {
                   return null;
                 }

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java

@@ -135,8 +135,8 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
     return new SparseArray<>();
   }
 
-  @Nullable
   @Override
+  @Nullable
   public TsPayloadReader createPayloadReader(int streamType, EsInfo esInfo) {
     switch (streamType) {
       case TsExtractor.TS_STREAM_TYPE_MPA:

library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java

@@ -138,8 +138,8 @@ public final class TsExtractorTest {
       }
     }
 
-    @Nullable
     @Override
+    @Nullable
     public TsPayloadReader createPayloadReader(int streamType, EsInfo esInfo) {
       if (provideCustomEsReader && streamType == 3) {
         esReader = new CustomEsReader(esInfo.language);

testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java

@@ -186,8 +186,8 @@ public class FakeDataSource extends BaseDataSource {
     }
   }
 
-  @Nullable
   @Override
+  @Nullable
   public final Uri getUri() {
     return uri;
   }

testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java

@@ -119,8 +119,8 @@ public class FakeMediaSource extends BaseMediaSource {
     return timeline.getWindow(0, new Timeline.Window()).tag;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public Timeline getInitialTimeline() {
     return timeline == null || timeline == Timeline.EMPTY || timeline.getWindowCount() == 1
         ? null

testutils/src/main/java/com/google/android/exoplayer2/testutil/MediaPeriodAsserts.java

@@ -231,8 +231,8 @@ public final class MediaPeriodAsserts {
       return C.SELECTION_REASON_UNKNOWN;
     }
 
-    @Nullable
     @Override
+    @Nullable
     public Object getSelectionData() {
       return null;
     }