commit 2f9a2b745398a51480dc78f361a600fd3e834795
author Chalard Jean <jchalard@google.com> Sun Feb 27 10:42:50 2022 +0900
committer Paul Hu <paulhu@google.com> Wed Jul 27 10:45:26 2022 +0000
tree 37f7b2c152d0aeb8f8b3bec3cd6d2d14464bb6b4
parent da7fe5732c4efd2e70922057c06b38b0c271144a

Change the sanitizeCaps signature in preparation for moving

This will move to NetworkAgentInfo. The caps argument is always
the same and can be removed, while the nai argument will become
'this'. The authenticator will need to be passed.

This is a second step towards addressing the leftover
comment from aosp/1958906.

Bug: 238139913
Test: FrameworksNetTests CtsNetTestCases
Change-Id: Ife5e91de15d0571f1251d2cd6f1b3ecc256572c6

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index bca3082..5602f26 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3607,7 +3607,7 @@
                     nai.declaredCapabilitiesUnsanitized =
                             new NetworkCapabilities((NetworkCapabilities) arg.second);
                     final NetworkCapabilities sanitized = sanitizedCapabilitiesFromAgent(
-                            nai, nai.declaredCapabilitiesUnsanitized);
+                            mCarrierPrivilegeAuthenticator, nai);
                     maybeUpdateWifiRoamTimestamp(nai, sanitized);
                     updateCapabilities(nai.getCurrentScore(), nai, sanitized);
                     break;
@@ -7331,7 +7331,7 @@
         nai.declaredCapabilitiesUnsanitized = new NetworkCapabilities(nai.networkCapabilities);
         // Make sure the LinkProperties and NetworkCapabilities reflect what the agent info said.
         final NetworkCapabilities nc =
-                sanitizedCapabilitiesFromAgent(nai, nai.declaredCapabilitiesUnsanitized);
+                sanitizedCapabilitiesFromAgent(mCarrierPrivilegeAuthenticator, nai);
         nai.getAndSetNetworkCapabilities(mixInCapabilities(nai, nc));
         processLinkPropertiesFromAgent(nai, lp);
         nai.linkProperties = lp;
@@ -7809,9 +7809,10 @@
      * {@link NetworkAgentInfo#declaredCapabilitiesUnsanitized}.
      */
     // TODO : move this to NetworkAgentInfo
-    private NetworkCapabilities sanitizedCapabilitiesFromAgent(@NonNull final NetworkAgentInfo nai,
-            @NonNull final NetworkCapabilities unsanitized) {
-        final NetworkCapabilities nc = new NetworkCapabilities(unsanitized);
+    private NetworkCapabilities sanitizedCapabilitiesFromAgent(
+            final CarrierPrivilegeAuthenticator carrierPrivilegeAuthenticator,
+            @NonNull final NetworkAgentInfo nai) {
+        final NetworkCapabilities nc = new NetworkCapabilities(nai.declaredCapabilitiesUnsanitized);
         if (nc.hasConnectivityManagedCapability()) {
             Log.wtf(TAG, "BUG: " + nai + " has CS-managed capability.");
         }
@@ -7822,7 +7823,7 @@
         }
         NetworkAgentInfo.restrictCapabilitiesFromNetworkAgent(nc, nai.creatorUid,
                 mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE),
-                mCarrierPrivilegeAuthenticator);
+                carrierPrivilegeAuthenticator);
         return nc;
     }
 
@@ -7951,7 +7952,7 @@
 
         if (nai.propagateUnderlyingCapabilities()) {
             applyUnderlyingCapabilities(nai.declaredUnderlyingNetworks,
-                    sanitizedCapabilitiesFromAgent(nai, nai.declaredCapabilitiesUnsanitized),
+                    sanitizedCapabilitiesFromAgent(mCarrierPrivilegeAuthenticator, nai),
                     newNc);
         }