From 7440dde808a2a5af34c4de27f1938a0d205c1451 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Fri, 13 Dec 2013 13:28:08 -0800
Subject: [PATCH] Use java.util.Objects instead of internal API

Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
---
 src/com/android/settings/net/NetworkPolicyEditor.java   | 4 ++--
 src/com/android/settings/widget/ChartDataUsageView.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java
index bfdaf99020d..82bd3857586 100644
--- a/src/com/android/settings/net/NetworkPolicyEditor.java
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -36,12 +36,12 @@ import android.os.AsyncTask;
 import android.text.TextUtils;
 import android.text.format.Time;
 
-import com.android.internal.util.Objects;
 import com.google.android.collect.Lists;
 import com.google.android.collect.Sets;
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Objects;
 
 /**
  * Utility class to modify list of {@link NetworkPolicy}. Specifically knows
@@ -265,7 +265,7 @@ public class NetworkPolicyEditor {
         boolean has4g = false;
         for (NetworkPolicy policy : mPolicies) {
             final NetworkTemplate template = policy.template;
-            if (Objects.equal(subscriberId, template.getSubscriberId())) {
+            if (Objects.equals(subscriberId, template.getSubscriberId())) {
                 switch (template.getMatchRule()) {
                     case MATCH_MOBILE_3G_LOWER:
                         has3g = true;
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index 19de100b1b7..4e16bfc9f8d 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -34,12 +34,12 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.internal.util.Objects;
 import com.android.settings.R;
 import com.android.settings.widget.ChartSweepView.OnSweepListener;
 
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Objects;
 
 /**
  * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along
@@ -466,7 +466,7 @@ public class ChartDataUsageView extends ChartView {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(mMin, mMax, mSize);
+            return Objects.hash(mMin, mMax, mSize);
         }
 
         @Override
@@ -548,7 +548,7 @@ public class ChartDataUsageView extends ChartView {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(mMin, mMax, mSize);
+            return Objects.hash(mMin, mMax, mSize);
         }
 
         @Override