| commit | 49b5be947d41c1d66d127912b8313bb097c225a6 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Mon May 15 17:48:28 2023 +0000 |
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | Mon May 15 17:48:28 2023 +0000 |
| tree | b327830ece068d101483a72554d2423ceaf48751 | |
| parent | 259bc8f5388f1818ccb8cda9a731f562ddb41551 [diff] | |
| parent | 78b8ff8493f37657aab5b7a297c0b510290f5cb5 [diff] |
[automerge] LinkProperties: use ordered comparison for P-CSCFs. 2p: 78b8ff8493 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23246157 Bug: 268479036 Change-Id: Ic2976edb195382e7963d83b2529ce8bf42989e9d Merged-In: Ia1884f37739a20d871dd0024cc72cb18c083dc8e
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); } /**