| commit | cf11f77e114ccadd662b1bab1bed14739935f14b | [log] [tgz] |
|---|---|---|
| author | Aaron Huang <huangaaron@google.com> | Tue Feb 22 11:30:00 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 22 11:30:00 2022 +0000 |
| tree | 40b77c9b5c7c66b36fc71bc5f8e5b620990f98ac | |
| parent | bf2848380721150c575fe0c00960fdb0191cc6ef [diff] | |
| parent | 213018b736f5f3753f1fdd92cdb6704611595c99 [diff] |
Merge "Check iface by TextUtils.equals" am: 213018b736 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946587 Change-Id: Id8fc2d7463688eab87259a310492d6a5c02c8a7a
diff --git a/framework-t/src/android/net/NetworkStats.java b/framework-t/src/android/net/NetworkStats.java index 9175809..f681ba1 100644 --- a/framework-t/src/android/net/NetworkStats.java +++ b/framework-t/src/android/net/NetworkStats.java
@@ -28,6 +28,7 @@ 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 @@ && 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; }