PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ef2f97c70e5942f390daf8e227eafa44ea675f09':
  Use java.util.Objects instead of internal API
This commit is contained in:
Kenny Root
2013-12-13 22:01:13 +00:00
committed by Android Git Automerger
parent 02dd4a20e9 ef2f97c70e
commit ead1bcd9a2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/net/NetworkPolicyEditor.java
View File

@@ -36,12 +36,12 @@ import android.os.AsyncTask;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.Time; import android.text.format.Time;
import com.android.internal.util.Objects;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
import com.google.android.collect.Sets; import com.google.android.collect.Sets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects;
/** /**
* Utility class to modify list of {@link NetworkPolicy}. Specifically knows * Utility class to modify list of {@link NetworkPolicy}. Specifically knows
@@ -265,7 +265,7 @@ public class NetworkPolicyEditor {
boolean has4g = false; boolean has4g = false;
for (NetworkPolicy policy : mPolicies) { for (NetworkPolicy policy : mPolicies) {
final NetworkTemplate template = policy.template; final NetworkTemplate template = policy.template;
if (Objects.equal(subscriberId, template.getSubscriberId())) { if (Objects.equals(subscriberId, template.getSubscriberId())) {
switch (template.getMatchRule()) { switch (template.getMatchRule()) {
case MATCH_MOBILE_3G_LOWER: case MATCH_MOBILE_3G_LOWER:
has3g = true; has3g = true;

6
src/com/android/settings/widget/ChartDataUsageView.java
View File

@@ -34,12 +34,12 @@ import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import com.android.internal.util.Objects;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.widget.ChartSweepView.OnSweepListener; import com.android.settings.widget.ChartSweepView.OnSweepListener;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Objects;
/** /**
* Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along
@@ -466,7 +466,7 @@ public class ChartDataUsageView extends ChartView {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hashCode(mMin, mMax, mSize); return Objects.hash(mMin, mMax, mSize);
} }
@Override @Override
@@ -548,7 +548,7 @@ public class ChartDataUsageView extends ChartView {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hashCode(mMin, mMax, mSize); return Objects.hash(mMin, mMax, mSize);
} }
@Override @Override