From 01cb6ee3a3f5e0f575a018ec10b9af75d2961906 Mon Sep 17 00:00:00 2001
From: gyumin <gyumin@google.com>
Date: Wed, 3 Mar 2021 01:12:52 +0000
Subject: [PATCH] Replace ObjectsCompat.equals to Util.areEquals

It's for consistency throughout libraries.

PiperOrigin-RevId: 360549525
---
 .../exoplayer2/ext/media2/SessionPlayerConnectorTest.java | 6 +++---
 .../android/exoplayer2/ext/media2/PlayerWrapper.java      | 3 +--
 .../exoplayer2/ext/media2/SessionPlayerConnector.java     | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
index 34cf19f86f..d4e996caa2 100644
--- a/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
+++ b/extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
@@ -30,7 +30,6 @@ import android.content.Context;
 import android.media.AudioManager;
 import android.os.Looper;
 import androidx.annotation.Nullable;
-import androidx.core.util.ObjectsCompat;
 import androidx.media.AudioAttributesCompat;
 import androidx.media2.common.MediaItem;
 import androidx.media2.common.MediaMetadata;
@@ -49,6 +48,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.ext.media2.test.R;
 import com.google.android.exoplayer2.upstream.RawResourceDataSource;
+import com.google.android.exoplayer2.util.Util;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -794,7 +794,7 @@ public class SessionPlayerConnectorTest {
               SessionPlayer player,
               @Nullable List<MediaItem> list,
               @Nullable MediaMetadata metadata) {
-            if (ObjectsCompat.equals(list, playlistToExoPlayer)) {
+            if (Util.areEqual(list, playlistToExoPlayer)) {
               onPlaylistChangedLatch.countDown();
             }
           }
@@ -825,7 +825,7 @@ public class SessionPlayerConnectorTest {
               SessionPlayer player,
               @Nullable List<MediaItem> list,
               @Nullable MediaMetadata metadata) {
-            if (ObjectsCompat.equals(list, playlistToExoPlayer)) {
+            if (Util.areEqual(list, playlistToExoPlayer)) {
               onPlaylistChangedLatch.countDown();
             }
           }
diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java
index 74d7bd110e..e0e87680f9 100644
--- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/PlayerWrapper.java
+++ b/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;
 import android.os.Handler;
 import androidx.annotation.IntRange;
 import androidx.annotation.Nullable;
-import androidx.core.util.ObjectsCompat;
 import androidx.media.AudioAttributesCompat;
 import androidx.media2.common.CallbackMediaItem;
 import androidx.media2.common.MediaMetadata;
@@ -535,7 +534,7 @@ import java.util.List;
     int windowCount = timeline.getWindowCount();
     for (int i = 0; i < windowCount; i++) {
       timeline.getWindow(i, window);
-      if (!ObjectsCompat.equals(exoPlayerPlaylist.get(i), window.mediaItem)) {
+      if (!Util.areEqual(exoPlayerPlaylist.get(i), window.mediaItem)) {
         return true;
       }
     }
diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java
index 9a3dc09b07..e51964b648 100644
--- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java
+++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnector.java
@@ -22,7 +22,6 @@ import androidx.annotation.FloatRange;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.IntRange;
 import androidx.annotation.Nullable;
-import androidx.core.util.ObjectsCompat;
 import androidx.core.util.Pair;
 import androidx.media.AudioAttributesCompat;
 import androidx.media2.common.CallbackMediaItem;
@@ -36,6 +35,7 @@ import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.util.Assertions;
 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.SettableFuture;
 import java.util.HashMap;
@@ -578,7 +578,7 @@ public final class SessionPlayerConnector extends SessionPlayer {
 
     MediaItem currentMediaItem = player.getCurrentMediaItem();
     boolean notifyCurrentMediaItem =
-        !ObjectsCompat.equals(this.currentMediaItem, currentMediaItem) && currentMediaItem != null;
+        !Util.areEqual(this.currentMediaItem, currentMediaItem) && currentMediaItem != null;
     this.currentMediaItem = currentMediaItem;
 
     long currentPosition = getCurrentPosition();
@@ -594,7 +594,7 @@ public final class SessionPlayerConnector extends SessionPlayer {
 
   private void notifySkipToCompletedOnHandler() {
     MediaItem currentMediaItem = Assertions.checkNotNull(player.getCurrentMediaItem());
-    if (ObjectsCompat.equals(this.currentMediaItem, currentMediaItem)) {
+    if (Util.areEqual(this.currentMediaItem, currentMediaItem)) {
       return;
     }
     this.currentMediaItem = currentMediaItem;
@@ -714,7 +714,7 @@ public final class SessionPlayerConnector extends SessionPlayer {
 
     @Override
     public void onCurrentMediaItemChanged(MediaItem mediaItem) {
-      if (ObjectsCompat.equals(currentMediaItem, mediaItem)) {
+      if (Util.areEqual(currentMediaItem, mediaItem)) {
         return;
       }
       currentMediaItem = mediaItem;