diff options
| author | Aaron Huang <huangaaron@google.com> | 2022-01-12 23:00:20 +0800 |
|---|---|---|
| committer | Aaron Huang <huangaaron@google.com> | 2022-01-12 23:30:43 +0800 |
| commit | e17a9d45364b5ec9eadb423b13a4ac23a4d12d79 (patch) | |
| tree | 5a1d110fc203dbadc17f5a0fa1ab0768b2bbe6d7 /framework-t/src | |
| parent | e6490468111cb2d2b2be74cd8a83589ad9c4b2f2 (diff) | |
Check iface by TextUtils.equals
In current equals method, if iface is null then it will cause
null object reference when checking iface.
Thus, use TextUtils.equals to check iface so that it can compare
null iface.
Bug: 210073043
Test: FrameworksNetTests, NetworkStaticLibTests
Change-Id: I2bd8127cb030ea54438382ee89961590fffbc31a
Diffstat (limited to 'framework-t/src')
| -rw-r--r-- | framework-t/src/android/net/NetworkStats.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework-t/src/android/net/NetworkStats.java b/framework-t/src/android/net/NetworkStats.java index b00fea4de2..352849c1e8 100644 --- a/framework-t/src/android/net/NetworkStats.java +++ b/framework-t/src/android/net/NetworkStats.java @@ -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; @@ -410,7 +411,7 @@ public final class NetworkStats implements Parcelable { && 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; } |