From c5abf346464657fff96f5e2322a7af6606ff2a09 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 23 Sep 2021 11:21:39 +0100
Subject: [PATCH] Add ExoPlayer.Builder#buildExoPlayer method

Annotate build() with @InlineMe. I will update build() to return Player
in a future change.

PiperOrigin-RevId: 398446323
---
 library/core/build.gradle                             |  1 +
 .../java/com/google/android/exoplayer2/ExoPlayer.java | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/library/core/build.gradle b/library/core/build.gradle
index bebd62beb9..98dd2929e7 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     api project(modulePrefix + 'library-extractor')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version
+    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/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index c44d5677ff..fe733dd4d1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -54,6 +54,7 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
 import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
 import com.google.android.exoplayer2.video.VideoSize;
 import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
+import com.google.errorprone.annotations.InlineMe;
 import java.util.List;
 
 /**
@@ -820,7 +821,17 @@ public interface ExoPlayer extends Player {
      *
      * @throws IllegalStateException If this method has already been called.
      */
+    @InlineMe(replacement = "this.buildExoPlayer()")
     public SimpleExoPlayer build() {
+      return buildExoPlayer();
+    }
+
+    /**
+     * Builds a {@link SimpleExoPlayer} instance.
+     *
+     * @throws IllegalStateException If this method has already been called.
+     */
+    public SimpleExoPlayer buildExoPlayer() {
       return wrappedBuilder.build();
     }
   }