From 12ca8903ce0789c0c8d5ccd90c48c7d7e8cc13f0 Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 23 May 2023 09:51:23 +0100 Subject: [PATCH] Remove deprecated `ExoPlayer.setHandleWakeLock(boolean)` Use `setWakeMode(int)` instead. #minor-release PiperOrigin-RevId: 534344010 (cherry picked from commit cad1ac2eb58e693194c165839843977bcccc3a8d) --- RELEASENOTES.md | 2 ++ .../main/java/androidx/media3/exoplayer/ExoPlayer.java | 7 ------- .../java/androidx/media3/exoplayer/ExoPlayerImpl.java | 6 ------ .../androidx/media3/exoplayer/SimpleExoPlayer.java | 10 ---------- .../java/androidx/media3/test/utils/StubExoPlayer.java | 9 --------- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index c5e0ae25ff..e360a7d6c4 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -97,6 +97,8 @@ * Core library: * Add `ExoPlayer.setVideoFrameProcessorFactory()` for using `Effect` with a custom `VideoFrameProcessor.Factory` during video playback. + * Remove `ExoPlayer.setHandleWakeLock(boolean)`, use `setWakeMode(int)` + instead. ### 1.0.2 (2023-05-18) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java index 0c3dc7fc63..b7cab5f4e8 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java @@ -1758,13 +1758,6 @@ public interface ExoPlayer extends Player { */ void setHandleAudioBecomingNoisy(boolean handleAudioBecomingNoisy); - /** - * @deprecated Use {@link #setWakeMode(int)} instead. - */ - @UnstableApi - @Deprecated - void setHandleWakeLock(boolean handleWakeLock); - /** * Sets how the player should keep the device awake for playback when the screen is off. * diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java index 3deac14e16..4f6483ac78 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java @@ -1665,12 +1665,6 @@ import java.util.concurrent.TimeoutException; listeners.remove(checkNotNull(listener)); } - @Override - public void setHandleWakeLock(boolean handleWakeLock) { - verifyApplicationThread(); - setWakeMode(handleWakeLock ? C.WAKE_MODE_LOCAL : C.WAKE_MODE_NONE); - } - @Override public void setWakeMode(@C.WakeMode int wakeMode) { verifyApplicationThread(); diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java index 6e2ff0c857..aaeec720da 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java @@ -1240,16 +1240,6 @@ public class SimpleExoPlayer extends BasePlayer return player.getContentBufferedPosition(); } - /** - * @deprecated Use {@link #setWakeMode(int)} instead. - */ - @Deprecated - @Override - public void setHandleWakeLock(boolean handleWakeLock) { - blockUntilConstructorFinished(); - player.setHandleWakeLock(handleWakeLock); - } - @Override public void setWakeMode(@C.WakeMode int wakeMode) { blockUntilConstructorFinished(); diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java index b2e20db5e9..35c0cedd5c 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java @@ -394,15 +394,6 @@ public class StubExoPlayer extends StubPlayer implements ExoPlayer { throw new UnsupportedOperationException(); } - /** - * @deprecated Use {@link #setWakeMode(int)} instead. - */ - @Deprecated - @Override - public void setHandleWakeLock(boolean handleWakeLock) { - throw new UnsupportedOperationException(); - } - @Override public void setWakeMode(int wakeMode) { throw new UnsupportedOperationException();