commit 9427b0e3a52bd1bae80faccbb752b89b982fe19e
author Mark Chien <markchien@google.com> Tue May 23 08:01:41 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 23 08:01:41 2023 +0000
tree 59887453bc9a0fcaae8576700a309783fd92a8b6
parent 76f4365d748949a0102fe3b28f14830837d72109
parent 7e31c3e495cb4376de802ce2c0771b0b14b53007

Merge "Fix entitlement recheck fail in U" into udc-dev

framework/src/android/net/LinkProperties.java

diff --git a/framework/src/android/net/LinkProperties.java b/framework/src/android/net/LinkProperties.java
index 4f7ac30..9fb9bc6 100644
--- a/framework/src/android/net/LinkProperties.java
+++ b/framework/src/android/net/LinkProperties.java
@@ -1456,8 +1456,13 @@
      * @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;
     }
 
     /**