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

Merge "Simplify the return condition in stop()" am: 584ab08627

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729690

Change-Id: Ie0701cb9c61afde51b04c902bd9f13f1e0559841
This commit is contained in:
Lucas Lin 2021-07-01 01:55:56 +00:00 • committed by Automerger Merge Worker
commit c955dcc84d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
service/src/com/android/server/connectivity/KeepaliveTracker.java
View file

@ -373,12 +373,10 @@ public class KeepaliveTracker {
Log.e(TAG, "Cannot stop unowned keepalive " + mSlot + " on " + mNai.network);
}
}
// Ignore the case when the network disconnects immediately after stop() has been
// called and the keepalive code is waiting for the response from the modem. This
// might happen when the caller listens for a lower-layer network disconnect
// callback and stop the keepalive at that time. But the stop() races with the
// stop() generated in ConnectivityService network disconnection code path.
if (mStartedState == STOPPING && reason == ERROR_INVALID_NETWORK) return;
// To prevent races from re-entrance of stop(), return if the state is already stopping.
// This might happen if multiple event sources stop keepalive in a short time. Such as
// network disconnect after user calls stop(), or tear down socket after binder died.
if (mStartedState == STOPPING) return;
// Store the reason of stopping, and report it after the keepalive is fully stopped.
if (mStopReason != ERROR_STOP_REASON_UNINITIALIZED) {

2
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View file

@ -5450,6 +5450,8 @@ public class ConnectivityServiceTest {
// the follow-up network disconnection will be processed first.
mWiFiNetworkAgent.setKeepaliveResponseDelay(3 * TIMEOUT_MS);
ka.stop();
// Call stop() twice shouldn't result in crash, b/182586681.
ka.stop();
// Make sure the stop has been processed. Wait for executor idle is needed to prevent
// flaky since the actual stop call to the service is delegated to executor thread.