From 43328d76234770f1beea1dc2f13ae55a4705e4ef Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 29 Nov 2021 16:59:53 +0000
Subject: [PATCH] Rollback of
 https://github.com/androidx/media/commit/f637bb3d40cf37a8ed545e78b45a67bd930e49fd

*** Original commit ***

Remove usage of @ForOverride.

Fixes the gradle compilation failures.

Gradle dependencies need revising if we want to be using this, as
checkerframework is ahead of their latest version, such that we
can't compile.

***

PiperOrigin-RevId: 412901827
---
 libraries/transformer/build.gradle                              | 1 +
 .../androidx/media3/transformer/TransformerBaseRenderer.java    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/libraries/transformer/build.gradle b/libraries/transformer/build.gradle
index fbe8e244ad..510f8eca97 100644
--- a/libraries/transformer/build.gradle
+++ b/libraries/transformer/build.gradle
@@ -37,6 +37,7 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'lib-exoplayer')
+    compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerBaseRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerBaseRenderer.java
index 1026dc0143..1b918a5e8d 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerBaseRenderer.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerBaseRenderer.java
@@ -29,6 +29,7 @@ import androidx.media3.exoplayer.ExoPlaybackException;
 import androidx.media3.exoplayer.MediaClock;
 import androidx.media3.exoplayer.RendererCapabilities;
 import androidx.media3.exoplayer.source.SampleStream.ReadDataResult;
+import com.google.errorprone.annotations.ForOverride;
 import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.RequiresNonNull;
@@ -133,6 +134,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     muxerWrapperTrackEnded = false;
   }
 
+  @ForOverride
   @EnsuresNonNullIf(expression = "samplePipeline", result = true)
   protected abstract boolean ensureConfigured() throws ExoPlaybackException;