joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "LinkProperties: use ordered comparison for P-CSCFs - only on U+"

Browse source
This commit is contained in:
Treehugger Robot 2023-05-22 04:40:48 +00:00 • committed by Gerrit Code Review
commit 78e158f2bb
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
framework/src/android/net/LinkProperties.java
View file

@ -1456,8 +1456,13 @@ public final class LinkProperties implements Parcelable {
* @hide
*/
public boolean isIdenticalPcscfs(@NonNull LinkProperties target) {
// list order is important, compare one by one
return target.getPcscfServers().equals(mPcscfs);
// Per 3GPP TS 24.229, B.2.2.1 PDP context activation and P-CSCF discovery
// list order is important, so on U+ compare one by one
if (SdkLevel.isAtLeastU()) return target.getPcscfServers().equals(mPcscfs);
// but for safety old behaviour on pre-U:
Collection<InetAddress> targetPcscfs = target.getPcscfServers();
return (mPcscfs.size() == targetPcscfs.size()) ?
mPcscfs.containsAll(targetPcscfs) : false;
}
/**