commit 77422187544271b04ce33d80718bcb4c3e73e565
author Aaron Huang <huangaaron@google.com> Wed Jan 12 23:00:20 2022 +0800
committer Aaron Huang <huangaaron@google.com> Wed Jan 12 23:30:43 2022 +0800
tree 5a1d110fc203dbadc17f5a0fa1ab0768b2bbe6d7
parent 5366b82996457142f2a4ec094fd8d71f908404ed

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

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

diff --git a/framework-t/src/android/net/NetworkStats.java b/framework-t/src/android/net/NetworkStats.java
index b00fea4..352849c 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;
@@ -410,7 +411,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;
         }