commit dff5df5b650d63e6f65fe5fc20a32ad32a6e3143
author Motomu Utsumi <motomuman@google.com> Tue May 14 18:19:43 2024 +0900
committer Motomu Utsumi <motomuman@google.com> Wed May 22 13:35:50 2024 +0900
tree f52372ee39b972df64be539e20b13edd6fed3e86
parent 390be06f64f13602de32411a72d7f81f008810e8

Rename closePendingFrozenSockets to destroyPendingSockets

As a preparation to update CS to destroy sockets for background apps,
renamed socket destroy methods to non specific to frozen apps

Bug: 300681644
Test: TH
Change-Id: I64c108aee1ee0d60df30ef055c8c9df8c6562d0f

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 82d6fb9..92efe2b 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3378,13 +3378,13 @@
         }
     }
 
-    private void closePendingFrozenSockets() {
+    private void destroyPendingSockets() {
         ensureRunningOnConnectivityServiceThread();
 
         try {
             mDeps.destroyLiveTcpSocketsByOwnerUids(mPendingFrozenUids);
         } catch (SocketException | InterruptedIOException | ErrnoException e) {
-            loge("Failed to close pending frozen app sockets: " + e);
+            loge("Failed to destroy sockets: " + e);
         }
         mPendingFrozenUids.clear();
     }
@@ -3407,17 +3407,17 @@
                 && params.isActive
                 && isCellNetworkActivity
                 && !mPendingFrozenUids.isEmpty()) {
-            closePendingFrozenSockets();
+            destroyPendingSockets();
         }
     }
 
     /**
-     * If the cellular network is no longer the default network, close pending frozen sockets.
+     * If the cellular network is no longer the default network, destroy pending sockets.
      *
      * @param newNetwork new default network
      * @param oldNetwork old default network
      */
-    private void maybeClosePendingFrozenSockets(NetworkAgentInfo newNetwork,
+    private void maybeDestroyPendingSockets(NetworkAgentInfo newNetwork,
             NetworkAgentInfo oldNetwork) {
         final boolean isOldNetworkCellular = oldNetwork != null
                 && oldNetwork.networkCapabilities.hasTransport(TRANSPORT_CELLULAR);
@@ -3427,7 +3427,7 @@
         if (isOldNetworkCellular
                 && !isNewNetworkCellular
                 && !mPendingFrozenUids.isEmpty()) {
-            closePendingFrozenSockets();
+            destroyPendingSockets();
         }
     }
 
@@ -5208,7 +5208,7 @@
 
                 if (mDefaultRequest == nri) {
                     mNetworkActivityTracker.updateDefaultNetwork(null /* newNetwork */, nai);
-                    maybeClosePendingFrozenSockets(null /* newNetwork */, nai);
+                    maybeDestroyPendingSockets(null /* newNetwork */, nai);
                     ensureNetworkTransitionWakelock(nai.toShortString());
                 }
             }
@@ -10084,7 +10084,7 @@
             mLingerMonitor.noteLingerDefaultNetwork(oldDefaultNetwork, newDefaultNetwork);
         }
         mNetworkActivityTracker.updateDefaultNetwork(newDefaultNetwork, oldDefaultNetwork);
-        maybeClosePendingFrozenSockets(newDefaultNetwork, oldDefaultNetwork);
+        maybeDestroyPendingSockets(newDefaultNetwork, oldDefaultNetwork);
         mProxyTracker.setDefaultProxy(null != newDefaultNetwork
                 ? newDefaultNetwork.linkProperties.getHttpProxy() : null);
         resetHttpProxyForNonDefaultNetwork(oldDefaultNetwork);