commit 7621e718d186303983d76842f7fd4a1a30c5e836
author Aaron Huang <huangaaron@google.com> Tue Feb 22 12:20:40 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 22 12:20:40 2022 +0000
tree 267f69f020eb392064a82922f7d7755490e3d9cc
parent e6387da92b975b05af6d9704af87297de66ddf3a
parent ec9eabfb4eb449b167bb1b90c2605b1c07c2bbfe

Merge "Check iface by TextUtils.equals" am: 3fb0bce788 am: df3676db1f am: ec9eabfb4e

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

Change-Id: Ifc4eb584382781de9ab5e4304357012d95660f66

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

diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStats.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStats.java
index 9175809..f681ba1 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStats.java
+++ b/packages/ConnectivityT/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;
         }