LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "LinkProperties: use ordered comparison for P-CSCFs - only on U+" am: 78e158f2bb am: 9135b92758

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2596485

Change-Id: I593620845f24b272d0610891f616137abd6a9b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-22 06:34:57 +00:00
committed by Automerger Merge Worker
parent 0cf44a71ad 9135b92758
commit 2d613cdfae
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 * @hide
*/ */
public boolean isIdenticalPcscfs(@NonNull LinkProperties target) { public boolean isIdenticalPcscfs(@NonNull LinkProperties target) {
// list order is important, compare one by one // Per 3GPP TS 24.229, B.2.2.1 PDP context activation and P-CSCF discovery
return target.getPcscfServers().equals(mPcscfs); // 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;
} }
/** /**