Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d8e25af authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 3bf6ac0c: am ead1bcd9: am ef2f97c7: am e14a5ef6: Merge "Use... 

am 3bf6ac0c: am ead1bcd9: am ef2f97c7: am e14a5ef6: Merge "Use java.util.Objects instead of internal API"

* commit '3bf6ac0c':
  Use java.util.Objects instead of internal API
parents ef693b57 3bf6ac0c

src/com/android/settings/net/NetworkPolicyEditor.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/widget/ChartDataUsageView.java

+3 −3
Original line number Diff line number Diff line
@@ -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