From facb59a13fef7dac5e947ea6313732b7359a52d4 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Mon, 19 Feb 2018 14:09:56 +0000
Subject: [PATCH] Remove uses of libcore.util.Objects.hashCode / equals.

Use public API in java.util.Objects instead.

Test: make
Change-Id: I2644164cc8ae5a6a25339abf7f2ed6e1c428c4ac
---
 src/com/android/settings/datausage/CycleAdapter.java        | 5 ++---
 .../settings/datausage/DataUsageSummaryPreference.java      | 6 +++---
 .../android/settings/display/ThemePreferenceController.java | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/datausage/CycleAdapter.java b/src/com/android/settings/datausage/CycleAdapter.java
index 01ba0b592be..e5c4e43034c 100644
--- a/src/com/android/settings/datausage/CycleAdapter.java
+++ b/src/com/android/settings/datausage/CycleAdapter.java
@@ -26,10 +26,9 @@ import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.net.ChartData;
 
-import libcore.util.Objects;
-
 import java.time.ZonedDateTime;
 import java.util.Iterator;
+import java.util.Objects;
 
 public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
 
@@ -142,7 +141,7 @@ public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
             // only force-update cycle when changed; skipping preserves any
             // user-defined inspection region.
             final CycleAdapter.CycleItem selectedItem = getItem(position);
-            if (!Objects.equal(selectedItem, previousItem)) {
+            if (!Objects.equals(selectedItem, previousItem)) {
                 mListener.onItemSelected(null, null, position, 0);
                 return false;
             }
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 984df023507..d88615402f8 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -28,7 +28,7 @@ import com.android.settings.R;
 import com.android.settings.SummaryPreference;
 import com.android.settingslib.utils.StringUtil;
 
-import libcore.util.Objects;
+import java.util.Objects;
 
 /**
  * Provides a summary of data usage.
@@ -51,7 +51,7 @@ public class DataUsageSummaryPreference extends SummaryPreference {
     }
 
     public void setLimitInfo(String text) {
-        if (!Objects.equal(text, mLimitInfoText)) {
+        if (!Objects.equals(text, mLimitInfoText)) {
             mLimitInfoText = text;
             notifyChanged();
         }
@@ -114,4 +114,4 @@ public class DataUsageSummaryPreference extends SummaryPreference {
             carrierInfo.setVisibility(View.GONE);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index ff31dbdc80f..1bc49b625d3 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -33,10 +33,9 @@ import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
-import libcore.util.Objects;
-
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;
 
@@ -111,7 +110,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String current = getTheme();
-        if (Objects.equal(newValue, current)) {
+        if (Objects.equals(newValue, current)) {
             return true;
         }
         mOverlayService.setEnabledExclusiveInCategory((String) newValue, UserHandle.myUserId());