| commit | 1216106e15ffe9d0e23212ed806a62db48c1cfff | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Mon May 15 18:57:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 15 18:57:53 2023 +0000 |
| tree | ef5cfc927bc86ae1d37848fa2a1cd0aba3d4befc | |
| parent | 1a790b6e9a73ae8606df1d0577b9cdb95ceac8bb [diff] | |
| parent | 9a53283d62a771474d741313b4f20c0b0dc4897d [diff] |
Merge "LinkProperties: use ordered comparison for P-CSCFs." am: 7428de995b am: 9a53283d62 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2580731 Change-Id: I06e35c8375bdb6b2218d8da3c3e9bfc866b83247 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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); } /**