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

Remove deprecated calls to external APIs

Browse Source 
PiperOrigin-RevId: 322346067
This commit is contained in:
olly 2020-07-21 14:15:43 +01:00 committed by Oliver Woodman
parent 4fbd09693a
commit d77ce9eda0
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
View File

@ -286,7 +286,7 @@ public final class TrackSelectionDialog extends DialogFragment {
private final class FragmentAdapter extends FragmentPagerAdapter { private final class FragmentAdapter extends FragmentPagerAdapter {
public FragmentAdapter(FragmentManager fragmentManager) { public FragmentAdapter(FragmentManager fragmentManager) {
super(fragmentManager); super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
} }
@Override @Override

12
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
View File

@ -885,7 +885,7 @@ public final class CastPlayer extends BasePlayer {
return; return;
} }
if (this.remoteMediaClient != null) { if (this.remoteMediaClient != null) {
this.remoteMediaClient.removeListener(statusListener); this.remoteMediaClient.unregisterCallback(statusListener);
this.remoteMediaClient.removeProgressListener(statusListener); this.remoteMediaClient.removeProgressListener(statusListener);
} }
this.remoteMediaClient = remoteMediaClient; this.remoteMediaClient = remoteMediaClient;
@ -893,7 +893,7 @@ public final class CastPlayer extends BasePlayer {
if (sessionAvailabilityListener != null) { if (sessionAvailabilityListener != null) {
sessionAvailabilityListener.onCastSessionAvailable(); sessionAvailabilityListener.onCastSessionAvailable();
} }
remoteMediaClient.addListener(statusListener); remoteMediaClient.registerCallback(statusListener);
remoteMediaClient.addProgressListener(statusListener, PROGRESS_REPORT_PERIOD_MS); remoteMediaClient.addProgressListener(statusListener, PROGRESS_REPORT_PERIOD_MS);
updateInternalStateAndNotifyIfChanged(); updateInternalStateAndNotifyIfChanged();
} else { } else {
@ -1007,10 +1007,8 @@ public final class CastPlayer extends BasePlayer {
// Internal classes. // Internal classes.
private final class StatusListener private final class StatusListener extends RemoteMediaClient.Callback
implements RemoteMediaClient.Listener, implements SessionManagerListener<CastSession>, RemoteMediaClient.ProgressListener {
SessionManagerListener<CastSession>,
RemoteMediaClient.ProgressListener {
// RemoteMediaClient.ProgressListener implementation. // RemoteMediaClient.ProgressListener implementation.
@ -1019,7 +1017,7 @@ public final class CastPlayer extends BasePlayer {
lastReportedPositionMs = progressMs; lastReportedPositionMs = progressMs;
} }
// RemoteMediaClient.Listener implementation. // RemoteMediaClient.Callback implementation.
@Override @Override
public void onStatusUpdated() { public void onStatusUpdated() {

21
extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastPlayerTest.java
View File

@ -59,8 +59,7 @@ public class CastPlayerTest {
private CastPlayer castPlayer; private CastPlayer castPlayer;
@SuppressWarnings("deprecation") private RemoteMediaClient.Callback remoteMediaClientCallback;
private RemoteMediaClient.Listener remoteMediaClientListener;
@Mock private RemoteMediaClient mockRemoteMediaClient; @Mock private RemoteMediaClient mockRemoteMediaClient;
@Mock private MediaStatus mockMediaStatus; @Mock private MediaStatus mockMediaStatus;
@ -76,7 +75,7 @@ public class CastPlayerTest {
private ArgumentCaptor<ResultCallback<RemoteMediaClient.MediaChannelResult>> private ArgumentCaptor<ResultCallback<RemoteMediaClient.MediaChannelResult>>
setResultCallbackArgumentCaptor; setResultCallbackArgumentCaptor;
@Captor private ArgumentCaptor<RemoteMediaClient.Listener> listenerArgumentCaptor; @Captor private ArgumentCaptor<RemoteMediaClient.Callback> callbackArgumentCaptor;
@Captor private ArgumentCaptor<MediaQueueItem[]> queueItemsArgumentCaptor; @Captor private ArgumentCaptor<MediaQueueItem[]> queueItemsArgumentCaptor;
@ -95,8 +94,8 @@ public class CastPlayerTest {
when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_OFF); when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_OFF);
castPlayer = new CastPlayer(mockCastContext); castPlayer = new CastPlayer(mockCastContext);
castPlayer.addListener(mockListener); castPlayer.addListener(mockListener);
verify(mockRemoteMediaClient).addListener(listenerArgumentCaptor.capture()); verify(mockRemoteMediaClient).registerCallback(callbackArgumentCaptor.capture());
remoteMediaClientListener = listenerArgumentCaptor.getValue(); remoteMediaClientCallback = callbackArgumentCaptor.getValue();
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@ -113,7 +112,7 @@ public class CastPlayerTest {
.onPlayWhenReadyChanged(true, Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST); .onPlayWhenReadyChanged(true, Player.PLAY_WHEN_READY_CHANGE_REASON_USER_REQUEST);
// There is a status update in the middle, which should be hidden by masking. // There is a status update in the middle, which should be hidden by masking.
remoteMediaClientListener.onStatusUpdated(); remoteMediaClientCallback.onStatusUpdated();
verifyNoMoreInteractions(mockListener); verifyNoMoreInteractions(mockListener);
// Upon result, the remoteMediaClient has updated its state according to the play() call. // Upon result, the remoteMediaClient has updated its state according to the play() call.
@ -169,7 +168,7 @@ public class CastPlayerTest {
public void playWhenReady_changesOnStatusUpdates() { public void playWhenReady_changesOnStatusUpdates() {
assertThat(castPlayer.getPlayWhenReady()).isFalse(); assertThat(castPlayer.getPlayWhenReady()).isFalse();
when(mockRemoteMediaClient.isPaused()).thenReturn(false); when(mockRemoteMediaClient.isPaused()).thenReturn(false);
remoteMediaClientListener.onStatusUpdated(); remoteMediaClientCallback.onStatusUpdated();
verify(mockListener).onPlayerStateChanged(true, Player.STATE_IDLE); verify(mockListener).onPlayerStateChanged(true, Player.STATE_IDLE);
verify(mockListener).onPlayWhenReadyChanged(true, Player.PLAY_WHEN_READY_CHANGE_REASON_REMOTE); verify(mockListener).onPlayWhenReadyChanged(true, Player.PLAY_WHEN_READY_CHANGE_REASON_REMOTE);
assertThat(castPlayer.getPlayWhenReady()).isTrue(); 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. // There is a status update in the middle, which should be hidden by masking.
when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_ALL); when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_ALL);
remoteMediaClientListener.onStatusUpdated(); remoteMediaClientCallback.onStatusUpdated();
verifyNoMoreInteractions(mockListener); verifyNoMoreInteractions(mockListener);
// Upon result, the mediaStatus now exposes the new repeat mode. // 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. // There is a status update in the middle, which should be hidden by masking.
when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_ALL); when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_ALL);
remoteMediaClientListener.onStatusUpdated(); remoteMediaClientCallback.onStatusUpdated();
verifyNoMoreInteractions(mockListener); verifyNoMoreInteractions(mockListener);
// Upon result, the repeat mode is ALL. The state should reflect that. // Upon result, the repeat mode is ALL. The state should reflect that.
@ -224,7 +223,7 @@ public class CastPlayerTest {
public void repeatMode_changesOnStatusUpdates() { public void repeatMode_changesOnStatusUpdates() {
assertThat(castPlayer.getRepeatMode()).isEqualTo(Player.REPEAT_MODE_OFF); assertThat(castPlayer.getRepeatMode()).isEqualTo(Player.REPEAT_MODE_OFF);
when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_SINGLE); when(mockMediaStatus.getQueueRepeatMode()).thenReturn(MediaStatus.REPEAT_MODE_REPEAT_SINGLE);
remoteMediaClientListener.onStatusUpdated(); remoteMediaClientCallback.onStatusUpdated();
verify(mockListener).onRepeatModeChanged(Player.REPEAT_MODE_ONE); verify(mockListener).onRepeatModeChanged(Player.REPEAT_MODE_ONE);
assertThat(castPlayer.getRepeatMode()).isEqualTo(Player.REPEAT_MODE_ONE); assertThat(castPlayer.getRepeatMode()).isEqualTo(Player.REPEAT_MODE_ONE);
} }
@ -494,6 +493,6 @@ public class CastPlayerTest {
castPlayer.addMediaItems(mediaItems); castPlayer.addMediaItems(mediaItems);
// Call listener to update the timeline of the player. // Call listener to update the timeline of the player.
remoteMediaClientListener.onQueueStatusUpdated(); remoteMediaClientCallback.onQueueStatusUpdated();
} }
} }

14
library/core/src/test/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeterTest.java
View File

@ -15,6 +15,8 @@
*/ */
package com.google.android.exoplayer2.upstream; 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 static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
@ -68,42 +70,42 @@ public final class DefaultBandwidthMeterTest {
ConnectivityManager.TYPE_WIFI, ConnectivityManager.TYPE_WIFI,
/* subType= */ 0, /* subType= */ 0,
/* isAvailable= */ false, /* isAvailable= */ false,
/* isConnected= */ false); DISCONNECTED);
networkInfoWifi = networkInfoWifi =
ShadowNetworkInfo.newInstance( ShadowNetworkInfo.newInstance(
DetailedState.CONNECTED, DetailedState.CONNECTED,
ConnectivityManager.TYPE_WIFI, ConnectivityManager.TYPE_WIFI,
/* subType= */ 0, /* subType= */ 0,
/* isAvailable= */ true, /* isAvailable= */ true,
/* isConnected= */ true); CONNECTED);
networkInfo2g = networkInfo2g =
ShadowNetworkInfo.newInstance( ShadowNetworkInfo.newInstance(
DetailedState.CONNECTED, DetailedState.CONNECTED,
ConnectivityManager.TYPE_MOBILE, ConnectivityManager.TYPE_MOBILE,
TelephonyManager.NETWORK_TYPE_GPRS, TelephonyManager.NETWORK_TYPE_GPRS,
/* isAvailable= */ true, /* isAvailable= */ true,
/* isConnected= */ true); CONNECTED);
networkInfo3g = networkInfo3g =
ShadowNetworkInfo.newInstance( ShadowNetworkInfo.newInstance(
DetailedState.CONNECTED, DetailedState.CONNECTED,
ConnectivityManager.TYPE_MOBILE, ConnectivityManager.TYPE_MOBILE,
TelephonyManager.NETWORK_TYPE_HSDPA, TelephonyManager.NETWORK_TYPE_HSDPA,
/* isAvailable= */ true, /* isAvailable= */ true,
/* isConnected= */ true); CONNECTED);
networkInfo4g = networkInfo4g =
ShadowNetworkInfo.newInstance( ShadowNetworkInfo.newInstance(
DetailedState.CONNECTED, DetailedState.CONNECTED,
ConnectivityManager.TYPE_MOBILE, ConnectivityManager.TYPE_MOBILE,
TelephonyManager.NETWORK_TYPE_LTE, TelephonyManager.NETWORK_TYPE_LTE,
/* isAvailable= */ true, /* isAvailable= */ true,
/* isConnected= */ true); CONNECTED);
networkInfoEthernet = networkInfoEthernet =
ShadowNetworkInfo.newInstance( ShadowNetworkInfo.newInstance(
DetailedState.CONNECTED, DetailedState.CONNECTED,
ConnectivityManager.TYPE_ETHERNET, ConnectivityManager.TYPE_ETHERNET,
/* subType= */ 0, /* subType= */ 0,
/* isAvailable= */ true, /* isAvailable= */ true,
/* isConnected= */ true); CONNECTED);
} }
@Test @Test