commit 28c597c265e369d9eb91ef526ccb628bba2a9218
author Maciej Żenczykowski <maze@google.com> Tue May 16 13:08:07 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 16 13:08:07 2023 +0000
tree e6ec24e4c095354d2939cd7f5af46befb42f6710
parent 60437e59de49306e1dc8ade4be561e5b98eccdb4
parent 49b5be947d41c1d66d127912b8313bb097c225a6

Merge changes from topic "cherrypicker-L86300000960661534:N86700001369044773" into udc-dev

* changes:
  [automerge] LinkProperties: use ordered comparison for P-CSCFs. 2p: 78b8ff8493
  LinkProperties: use ordered comparison for P-CSCFs.

framework/src/android/net/LinkProperties.java

diff --git a/framework/src/android/net/LinkProperties.java b/framework/src/android/net/LinkProperties.java
index e0926e9..4f7ac30 100644
--- a/framework/src/android/net/LinkProperties.java
+++ b/framework/src/android/net/LinkProperties.java
@@ -1456,9 +1456,8 @@
      * @hide
      */
     public boolean isIdenticalPcscfs(@NonNull LinkProperties target) {
-        Collection<InetAddress> targetPcscfs = target.getPcscfServers();
-        return (mPcscfs.size() == targetPcscfs.size()) ?
-                    mPcscfs.containsAll(targetPcscfs) : false;
+        // list order is important, compare one by one
+        return target.getPcscfServers().equals(mPcscfs);
     }
 
     /**