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

Commit ec9eabfb authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Check iface by TextUtils.equals" am: 3fb0bce7 am: df3676db 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946587

Change-Id: I41201f59d771ea2415f49fcd3f7b9484785522b7
parents e47d8600 df3676db

packages/ConnectivityT/framework-t/src/android/net/NetworkStats.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.os.Process;

import android.os.SystemClock;

import android.text.TextUtils;

import android.util.SparseBooleanArray;



import com.android.internal.annotations.VisibleForTesting;
@@ -500,7 +501,7 @@ public final class NetworkStats implements Parcelable, Iterable<NetworkStats.Ent 
                        && roaming == e.roaming && defaultNetwork == e.defaultNetwork

                        && rxBytes == e.rxBytes && rxPackets == e.rxPackets

                        && txBytes == e.txBytes && txPackets == e.txPackets

                        && operations == e.operations && iface.equals(e.iface);

                        && operations == e.operations && TextUtils.equals(iface, e.iface);

            }

            return false;

        }