Skip to content

SDK / exoplayer

Go to a project
Commit 01cb6ee3 by gyumin Committed by Ian Baker
Options

Replace ObjectsCompat.equals to Util.areEquals 

It's for consistency throughout libraries.

PiperOrigin-RevId: 360549525
parent f5024131
Inline Side-by-side
Showing with 8 additions and 9 deletions
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
...@@ -30,7 +30,6 @@ import android.content.Context; ...@@ -30,7 +30,6 @@ import android.content.Context;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Looper; import android.os.Looper;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.util.ObjectsCompat;
import androidx.media.AudioAttributesCompat; import androidx.media.AudioAttributesCompat;
import androidx.media2.common.MediaItem; import androidx.media2.common.MediaItem;
import androidx.media2.common.MediaMetadata; import androidx.media2.common.MediaMetadata;
...@@ -49,6 +48,7 @@ import com.google.android.exoplayer2.Player; ...@@ -49,6 +48,7 @@ import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.ext.media2.test.R; import com.google.android.exoplayer2.ext.media2.test.R;
import com.google.android.exoplayer2.upstream.RawResourceDataSource; import com.google.android.exoplayer2.upstream.RawResourceDataSource;
import com.google.android.exoplayer2.util.Util;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -794,7 +794,7 @@ public class SessionPlayerConnectorTest { ...@@ -794,7 +794,7 @@ public class SessionPlayerConnectorTest {
SessionPlayer player, SessionPlayer player,
@Nullable List<MediaItem> list, @Nullable List<MediaItem> list,
@Nullable MediaMetadata metadata) { @Nullable MediaMetadata metadata) {
if (ObjectsCompat.equals(list, playlistToExoPlayer)) { if (Util.areEqual(list, playlistToExoPlayer)) {
onPlaylistChangedLatch.countDown(); onPlaylistChangedLatch.countDown();
} }
} }
...@@ -825,7 +825,7 @@ public class SessionPlayerConnectorTest { ...@@ -825,7 +825,7 @@ public class SessionPlayerConnectorTest {
SessionPlayer player, SessionPlayer player,
@Nullable List<MediaItem> list, @Nullable List<MediaItem> list,
@Nullable MediaMetadata metadata) { @Nullable MediaMetadata metadata) {
if (ObjectsCompat.equals(list, playlistToExoPlayer)) { if (Util.areEqual(list, playlistToExoPlayer)) {
onPlaylistChangedLatch.countDown(); onPlaylistChangedLatch.countDown();
} }
} }
......
extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java
...@@ -20,7 +20,6 @@ import static com.google.android.exoplayer2.util.Util.postOrRun; ...@@ -20,7 +20,6 @@ import static com.google.android.exoplayer2.util.Util.postOrRun;
import android.os.Handler; import android.os.Handler;
import androidx.annotation.IntRange; import androidx.annotation.IntRange;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.util.ObjectsCompat;
import androidx.media.AudioAttributesCompat; import androidx.media.AudioAttributesCompat;
import androidx.media2.common.CallbackMediaItem; import androidx.media2.common.CallbackMediaItem;
import androidx.media2.common.MediaMetadata; import androidx.media2.common.MediaMetadata;
...@@ -535,7 +534,7 @@ import java.util.List; ...@@ -535,7 +534,7 @@ import java.util.List;
int windowCount = timeline.getWindowCount(); int windowCount = timeline.getWindowCount();
for (int i = 0; i < windowCount; i++) { for (int i = 0; i < windowCount; i++) {
timeline.getWindow(i, window); timeline.getWindow(i, window);
if (!ObjectsCompat.equals(exoPlayerPlaylist.get(i), window.mediaItem)) { if (!Util.areEqual(exoPlayerPlaylist.get(i), window.mediaItem)) {
return true; return true;
} }
} }
......
extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java
...@@ -22,7 +22,6 @@ import androidx.annotation.FloatRange; ...@@ -22,7 +22,6 @@ import androidx.annotation.FloatRange;
import androidx.annotation.GuardedBy; import androidx.annotation.GuardedBy;
import androidx.annotation.IntRange; import androidx.annotation.IntRange;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.util.ObjectsCompat;
import androidx.core.util.Pair; import androidx.core.util.Pair;
import androidx.media.AudioAttributesCompat; import androidx.media.AudioAttributesCompat;
import androidx.media2.common.CallbackMediaItem; import androidx.media2.common.CallbackMediaItem;
...@@ -36,6 +35,7 @@ import com.google.android.exoplayer2.ExoPlayerLibraryInfo; ...@@ -36,6 +35,7 @@ import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.SettableFuture;
import java.util.HashMap; import java.util.HashMap;
...@@ -578,7 +578,7 @@ public final class SessionPlayerConnector extends SessionPlayer { ...@@ -578,7 +578,7 @@ public final class SessionPlayerConnector extends SessionPlayer {
MediaItem currentMediaItem = player.getCurrentMediaItem(); MediaItem currentMediaItem = player.getCurrentMediaItem();
boolean notifyCurrentMediaItem = boolean notifyCurrentMediaItem =
!ObjectsCompat.equals(this.currentMediaItem, currentMediaItem) && currentMediaItem != null; !Util.areEqual(this.currentMediaItem, currentMediaItem) && currentMediaItem != null;
this.currentMediaItem = currentMediaItem; this.currentMediaItem = currentMediaItem;
long currentPosition = getCurrentPosition(); long currentPosition = getCurrentPosition();
...@@ -594,7 +594,7 @@ public final class SessionPlayerConnector extends SessionPlayer { ...@@ -594,7 +594,7 @@ public final class SessionPlayerConnector extends SessionPlayer {
private void notifySkipToCompletedOnHandler() { private void notifySkipToCompletedOnHandler() {
MediaItem currentMediaItem = Assertions.checkNotNull(player.getCurrentMediaItem()); MediaItem currentMediaItem = Assertions.checkNotNull(player.getCurrentMediaItem());
if (ObjectsCompat.equals(this.currentMediaItem, currentMediaItem)) { if (Util.areEqual(this.currentMediaItem, currentMediaItem)) {
return; return;
} }
this.currentMediaItem = currentMediaItem; this.currentMediaItem = currentMediaItem;
...@@ -714,7 +714,7 @@ public final class SessionPlayerConnector extends SessionPlayer { ...@@ -714,7 +714,7 @@ public final class SessionPlayerConnector extends SessionPlayer {
@Override @Override
public void onCurrentMediaItemChanged(MediaItem mediaItem) { public void onCurrentMediaItemChanged(MediaItem mediaItem) {
if (ObjectsCompat.equals(currentMediaItem, mediaItem)) { if (Util.areEqual(currentMediaItem, mediaItem)) {
return; return;
} }
currentMediaItem = mediaItem; currentMediaItem = mediaItem;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment