Merge "Check iface by TextUtils.equals" am: 213018b736 am: cf11f77e11 am: 0eb1037a53

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

Change-Id: Ifc4eb584382781de9ab5e4304357012d95660f66
This commit is contained in:
Aaron Huang
2022-02-22 12:20:40 +00:00
committed by Automerger Merge Worker

View File

@@ -28,6 +28,7 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.Process; import android.os.Process;
import android.os.SystemClock; import android.os.SystemClock;
import android.text.TextUtils;
import android.util.SparseBooleanArray; import android.util.SparseBooleanArray;
import com.android.internal.annotations.VisibleForTesting; 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 && roaming == e.roaming && defaultNetwork == e.defaultNetwork
&& rxBytes == e.rxBytes && rxPackets == e.rxPackets && rxBytes == e.rxBytes && rxPackets == e.rxPackets
&& txBytes == e.txBytes && txPackets == e.txPackets && txBytes == e.txBytes && txPackets == e.txPackets
&& operations == e.operations && iface.equals(e.iface); && operations == e.operations && TextUtils.equals(iface, e.iface);
} }
return false; return false;
} }