From d77ce9eda06514b9b51ad890ae87e8e638678f9d Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 21 Jul 2020 14:15:43 +0100 Subject: [PATCH] Remove deprecated calls to external APIs PiperOrigin-RevId: 322346067 --- .../exoplayer2/demo/TrackSelectionDialog.java | 2 +- .../exoplayer2/ext/cast/CastPlayer.java | 12 +++++------ .../exoplayer2/ext/cast/CastPlayerTest.java | 21 +++++++++---------- .../upstream/DefaultBandwidthMeterTest.java | 14 +++++++------ 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java index b1db44110d..5cf2353f21 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java @@ -286,7 +286,7 @@ public final class TrackSelectionDialog extends DialogFragment { private final class FragmentAdapter extends FragmentPagerAdapter { public FragmentAdapter(FragmentManager fragmentManager) { - super(fragmentManager); + super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); } @Override diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java index 6e74e8325f..be44a7f8b1 100644 --- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java +++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java @@ -885,7 +885,7 @@ public final class CastPlayer extends BasePlayer { return; } if (this.remoteMediaClient != null) { - this.remoteMediaClient.removeListener(statusListener); + this.remoteMediaClient.unregisterCallback(statusListener); this.remoteMediaClient.removeProgressListener(statusListener); } this.remoteMediaClient = remoteMediaClient; @@ -893,7 +893,7 @@ public final class CastPlayer extends BasePlayer { if (sessionAvailabilityListener != null) { sessionAvailabilityListener.onCastSessionAvailable(); } - remoteMediaClient.addListener(statusListener); + remoteMediaClient.registerCallback(statusListener); remoteMediaClient.addProgressListener(statusListener, PROGRESS_REPORT_PERIOD_MS); updateInternalStateAndNotifyIfChanged(); } else { @@ -1007,10 +1007,8 @@ public final class CastPlayer extends BasePlayer { // Internal classes. - private final class StatusListener - implements RemoteMediaClient.Listener, - SessionManagerListener, - RemoteMediaClient.ProgressListener { + private final class StatusListener extends RemoteMediaClient.Callback + implements SessionManagerListener, RemoteMediaClient.ProgressListener { // RemoteMediaClient.ProgressListener implementation. @@ -1019,7 +1017,7 @@ public final class CastPlayer extends BasePlayer { lastReportedPositionMs = progressMs; } - // RemoteMediaClient.Listener implementation. + // RemoteMediaClient.Callback implementation. @Override public void onStatusUpdated() { diff --git a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java index d1ab67b5ad..049bc89b72 100644 --- a/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java +++ b/extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java @@ -59,8 +59,7 @@ public class CastPlayerTest { private CastPlayer castPlayer; - @SuppressWarnings("deprecation") - private RemoteMediaClient.Listener remoteMediaClientListener; + private RemoteMediaClient.Callback remoteMediaClientCallback; @Mock private RemoteMediaClient mockRemoteMediaClient; @Mock private MediaStatus mockMediaStatus; @@ -76,7 +75,7 @@ public class CastPlayerTest { private ArgumentCaptor> setResultCallbackArgumentCaptor; - @Captor private ArgumentCaptor listenerArgumentCaptor; + @Captor private ArgumentCaptor callbackArgumentCaptor; @Captor private ArgumentCaptor queueItemsArgumentCaptor; @@ -95,8 +94,8 @@ public class CastPlayerTest { when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_OFF); castPlayer = new CastPlayer(mockCastContext); castPlayer.addListener(mockListener); - verify(mockRemoteMediaClient).addListener(listenerArgumentCaptor.capture()); - remoteMediaClientListener = listenerArgumentCaptor.getValue(); + verify(mockRemoteMediaClient).registerCallback(callbackArgumentCaptor.capture()); + remoteMediaClientCallback = callbackArgumentCaptor.getValue(); } @SuppressWarnings("deprecation") @@ -113,7 +112,7 @@ public class CastPlayerTest { .onPlayWhenReadyChanged(true, Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST); // There is a status update in the middle, which should be hidden by masking. - remoteMediaClientListener.onStatusUpdated(); + remoteMediaClientCallback.onStatusUpdated(); verifyNoMoreInteractions(mockListener); // Upon result, the remoteMediaClient has updated its state according to the play() call. @@ -169,7 +168,7 @@ public class CastPlayerTest { public void playWhenReady_changesOnStatusUpdates() { assertThat(castPlayer.getPlayWhenReady()).isFalse(); when(mockRemoteMediaClient.isPaused()).thenReturn(false); - remoteMediaClientListener.onStatusUpdated(); + remoteMediaClientCallback.onStatusUpdated(); verify(mockListener).onPlayerStateChanged(true, Player.STATE_IDLE); verify(mockListener).onPlayWhenReadyChanged(true, Player.PLAY_WHEN_READY_CHANGE_REASON_REMOTE); assertThat(castPlayer.getPlayWhenReady()).isTrue(); @@ -187,7 +186,7 @@ public class CastPlayerTest { // There is a status update in the middle, which should be hidden by masking. when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_ALL); - remoteMediaClientListener.onStatusUpdated(); + remoteMediaClientCallback.onStatusUpdated(); verifyNoMoreInteractions(mockListener); // Upon result, the mediaStatus now exposes the new repeat mode. @@ -209,7 +208,7 @@ public class CastPlayerTest { // There is a status update in the middle, which should be hidden by masking. when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_ALL); - remoteMediaClientListener.onStatusUpdated(); + remoteMediaClientCallback.onStatusUpdated(); verifyNoMoreInteractions(mockListener); // Upon result, the repeat mode is ALL. The state should reflect that. @@ -224,7 +223,7 @@ public class CastPlayerTest { public void repeatMode_changesOnStatusUpdates() { assertThat(castPlayer.getRepeatMode()).isEqualTo(Player.REPEAT_MODE_OFF); when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_SINGLE); - remoteMediaClientListener.onStatusUpdated(); + remoteMediaClientCallback.onStatusUpdated(); verify(mockListener).onRepeatModeChanged(Player.REPEAT_MODE_ONE); assertThat(castPlayer.getRepeatMode()).isEqualTo(Player.REPEAT_MODE_ONE); } @@ -494,6 +493,6 @@ public class CastPlayerTest { castPlayer.addMediaItems(mediaItems); // Call listener to update the timeline of the player. - remoteMediaClientListener.onQueueStatusUpdated(); + remoteMediaClientCallback.onQueueStatusUpdated(); } } diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java index 9f30cf4649..23f5a17e93 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.upstream; +import static android.net.NetworkInfo.State.CONNECTED; +import static android.net.NetworkInfo.State.DISCONNECTED; import static com.google.common.truth.Truth.assertThat; import android.content.Context; @@ -68,42 +70,42 @@ public final class DefaultBandwidthMeterTest { ConnectivityManager.TYPE_WIFI, /* subType= */ 0, /* isAvailable= */ false, - /* isConnected= */ false); + DISCONNECTED); networkInfoWifi = ShadowNetworkInfo.newInstance( DetailedState.CONNECTED, ConnectivityManager.TYPE_WIFI, /* subType= */ 0, /* isAvailable= */ true, - /* isConnected= */ true); + CONNECTED); networkInfo2g = ShadowNetworkInfo.newInstance( DetailedState.CONNECTED, ConnectivityManager.TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_GPRS, /* isAvailable= */ true, - /* isConnected= */ true); + CONNECTED); networkInfo3g = ShadowNetworkInfo.newInstance( DetailedState.CONNECTED, ConnectivityManager.TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_HSDPA, /* isAvailable= */ true, - /* isConnected= */ true); + CONNECTED); networkInfo4g = ShadowNetworkInfo.newInstance( DetailedState.CONNECTED, ConnectivityManager.TYPE_MOBILE, TelephonyManager.NETWORK_TYPE_LTE, /* isAvailable= */ true, - /* isConnected= */ true); + CONNECTED); networkInfoEthernet = ShadowNetworkInfo.newInstance( DetailedState.CONNECTED, ConnectivityManager.TYPE_ETHERNET, /* subType= */ 0, /* isAvailable= */ true, - /* isConnected= */ true); + CONNECTED); } @Test