| commit | 17c9370e99ad13a99414fa91b2a975de24e9caf3 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Tue May 16 14:33:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 16 14:33:17 2023 +0000 |
| tree | e6ec24e4c095354d2939cd7f5af46befb42f6710 | |
| parent | 61ccb1b7b71d06a9bf485bf2fe37ca69f3c08d72 [diff] | |
| parent | 0185601f1aba1416b4589ee269039c40eab2f231 [diff] |
Merge changes from topic "cherrypicker-L86300000960661534:N86700001369044773" into udc-dev am: 28c597c265 am: 0185601f1a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23246157 Change-Id: I654a0608c919acc021d0390095aedf26ef129bf9 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); } /**