diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index 8413488cc3..bcedbfc238 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -387,6 +387,7 @@ import java.util.concurrent.TimeoutException; @Override @Deprecated public AudioComponent getAudioComponent() { + verifyApplicationThread(); return this; } @@ -394,6 +395,7 @@ import java.util.concurrent.TimeoutException; @Override @Deprecated public VideoComponent getVideoComponent() { + verifyApplicationThread(); return this; } @@ -401,6 +403,7 @@ import java.util.concurrent.TimeoutException; @Override @Deprecated public TextComponent getTextComponent() { + verifyApplicationThread(); return this; } @@ -408,6 +411,7 @@ import java.util.concurrent.TimeoutException; @Override @Deprecated public DeviceComponent getDeviceComponent() { + verifyApplicationThread(); return this; } @@ -481,6 +485,7 @@ import java.util.concurrent.TimeoutException; @Override @Deprecated public void retry() { + verifyApplicationThread(); prepare(); } @@ -911,6 +916,7 @@ import java.util.concurrent.TimeoutException; @Override public void stop() { + verifyApplicationThread(); stop(/* reset= */ false); } @@ -1194,6 +1200,7 @@ import java.util.concurrent.TimeoutException; @Override public @C.VideoScalingMode int getVideoScalingMode() { + verifyApplicationThread(); return videoScalingMode; } @@ -1211,11 +1218,13 @@ import java.util.concurrent.TimeoutException; @Override public @C.VideoChangeFrameRateStrategy int getVideoChangeFrameRateStrategy() { + verifyApplicationThread(); return videoChangeFrameRateStrategy; } @Override public VideoSize getVideoSize() { + verifyApplicationThread(); return videoSize; } @@ -1362,6 +1371,7 @@ import java.util.concurrent.TimeoutException; @Override public AudioAttributes getAudioAttributes() { + verifyApplicationThread(); return audioAttributes; } @@ -1392,6 +1402,7 @@ import java.util.concurrent.TimeoutException; @Override public int getAudioSessionId() { + verifyApplicationThread(); return audioSessionId; } @@ -1403,6 +1414,7 @@ import java.util.concurrent.TimeoutException; @Override public void clearAuxEffectInfo() { + verifyApplicationThread(); setAuxEffectInfo(new AuxEffectInfo(AuxEffectInfo.NO_AUX_EFFECT_ID, /* sendLevel= */ 0f)); } @@ -1421,11 +1433,13 @@ import java.util.concurrent.TimeoutException; @Override public float getVolume() { + verifyApplicationThread(); return volume; } @Override public boolean getSkipSilenceEnabled() { + verifyApplicationThread(); return skipSilenceEnabled; } @@ -1444,6 +1458,7 @@ import java.util.concurrent.TimeoutException; @Override public AnalyticsCollector getAnalyticsCollector() { + verifyApplicationThread(); return analyticsCollector; } @@ -1490,24 +1505,28 @@ import java.util.concurrent.TimeoutException; @Override @Nullable public Format getVideoFormat() { + verifyApplicationThread(); return videoFormat; } @Override @Nullable public Format getAudioFormat() { + verifyApplicationThread(); return audioFormat; } @Override @Nullable public DecoderCounters getVideoDecoderCounters() { + verifyApplicationThread(); return videoDecoderCounters; } @Override @Nullable public DecoderCounters getAudioDecoderCounters() { + verifyApplicationThread(); return audioDecoderCounters; } @@ -1577,6 +1596,7 @@ import java.util.concurrent.TimeoutException; @Override public void setHandleWakeLock(boolean handleWakeLock) { + verifyApplicationThread(); setWakeMode(handleWakeLock ? C.WAKE_MODE_LOCAL : C.WAKE_MODE_NONE); }