From b0fc6627a6f76c02f3e420bbdd0a86581c955234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Fri, 5 May 2023 20:41:28 +0000 Subject: [PATCH] LinkProperties: use ordered comparison for P-CSCFs. P-CSCF list is ordered list. Two lists with same servers but in different order are not equal. Use proper comparison. The P-CSCF address is a kind of entry point (proxy) of Server for IMS transaction between device and IMS Server. It can have multiple addresses as a list. Even if the same addresses have different orders, it is assumed that the server order has changed. Bug: 268479036 Test: TreeHugger Change-Id: Ia1884f37739a20d871dd0024cc72cb18c083dc8e --- framework/src/android/net/LinkProperties.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/src/android/net/LinkProperties.java b/framework/src/android/net/LinkProperties.java index e0926e92c7..4f7ac30b5e 100644 --- a/framework/src/android/net/LinkProperties.java +++ b/framework/src/android/net/LinkProperties.java @@ -1456,9 +1456,8 @@ public final class LinkProperties implements Parcelable { * @hide */ public boolean isIdenticalPcscfs(@NonNull LinkProperties target) { - Collection 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); } /**