loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ExoPlayer.Builder#build() to return Player

Browse Source 
If callers need an ExoPlayer instance they should use buildExoPlayer().

Also remove the @InlineMe annotation now these methods are no longer
equivalent.

PiperOrigin-RevId: 400143239
This commit is contained in:
ibaker 2021-10-01 10:09:48 +01:00 committed by Oliver Woodman
parent 9926a8f6e3
commit 4e9e38f3a7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/core/build.gradle
View File

@ -39,7 +39,6 @@ dependencies {
api project(modulePrefix + 'library-extractor') api project(modulePrefix + 'library-extractor')
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version 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-qual:' + checkerframeworkVersion
compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion

6
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
View File

@ -54,7 +54,6 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoSize; import com.google.android.exoplayer2.video.VideoSize;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener; import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import com.google.errorprone.annotations.InlineMe;
import java.util.List; import java.util.List;
/** /**
@ -839,13 +838,12 @@ public interface ExoPlayer extends Player {
} }
/** /**
* Builds a {@link SimpleExoPlayer} instance. * Builds a {@link Player} instance.
* *
* @throws IllegalStateException If this method or {@link #buildExoPlayer()} has already been * @throws IllegalStateException If this method or {@link #buildExoPlayer()} has already been
* called. * called.
*/ */
@InlineMe(replacement = "this.buildExoPlayer()") public Player build() {
public SimpleExoPlayer build() {
return buildExoPlayer(); return buildExoPlayer();
} }