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

Rename closePendingFrozenSockets to destroyPendingSockets

Browse source 
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
This commit is contained in:
Motomu Utsumi 2024-05-14 18:19:43 +09:00
commit dff5df5b65
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
service/src/com/android/server/ConnectivityService.java
View file

@ -3378,13 +3378,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
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 @@ public class ConnectivityService extends IConnectivityManager.Stub
&& 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 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (isOldNetworkCellular
&& !isNewNetworkCellular
&& !mPendingFrozenUids.isEmpty()) {
closePendingFrozenSockets();
destroyPendingSockets();
}
}
@ -5208,7 +5208,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (mDefaultRequest == nri) {
mNetworkActivityTracker.updateDefaultNetwork(null /* newNetwork */, nai);
maybeClosePendingFrozenSockets(null /* newNetwork */, nai);
maybeDestroyPendingSockets(null /* newNetwork */, nai);
ensureNetworkTransitionWakelock(nai.toShortString());
}
}
@ -10084,7 +10084,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mLingerMonitor.noteLingerDefaultNetwork(oldDefaultNetwork, newDefaultNetwork);
}
mNetworkActivityTracker.updateDefaultNetwork(newDefaultNetwork, oldDefaultNetwork);
maybeClosePendingFrozenSockets(newDefaultNetwork, oldDefaultNetwork);
maybeDestroyPendingSockets(newDefaultNetwork, oldDefaultNetwork);
mProxyTracker.setDefaultProxy(null != newDefaultNetwork
? newDefaultNetwork.linkProperties.getHttpProxy() : null);
resetHttpProxyForNonDefaultNetwork(oldDefaultNetwork);