Move mPendingFrozenUids empty check to destroyPendingSockets
Test: ConnectivityServiceTest
Bug: 300681644
Change-Id: Ic31f6b1ccea8bab8cce948736b74cf3e8e7fb2ba
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 92efe2b..69ce602 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3380,6 +3380,9 @@
private void destroyPendingSockets() {
ensureRunningOnConnectivityServiceThread();
+ if (mPendingFrozenUids.isEmpty()) {
+ return;
+ }
try {
mDeps.destroyLiveTcpSocketsByOwnerUids(mPendingFrozenUids);
@@ -3403,10 +3406,7 @@
isCellNetworkActivity = params.label == TRANSPORT_CELLULAR;
}
- if (mDelayDestroySockets
- && params.isActive
- && isCellNetworkActivity
- && !mPendingFrozenUids.isEmpty()) {
+ if (mDelayDestroySockets && params.isActive && isCellNetworkActivity) {
destroyPendingSockets();
}
}
@@ -3424,9 +3424,7 @@
final boolean isNewNetworkCellular = newNetwork != null
&& newNetwork.networkCapabilities.hasTransport(TRANSPORT_CELLULAR);
- if (isOldNetworkCellular
- && !isNewNetworkCellular
- && !mPendingFrozenUids.isEmpty()) {
+ if (isOldNetworkCellular && !isNewNetworkCellular) {
destroyPendingSockets();
}
}