Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disconnect VPN when the underlying network is lost" am: f55958fcfd am: a03e3f9a75 am: b883281ecc am: ceecf64cde

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2222603

Change-Id: I77809922772b3ec858d6b602d75a82a3c582c6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2022-09-21 23:45:25 +00:00
committed by Automerger Merge Worker
parent 9ce9a210a0 ceecf64cde
commit 429e5dcc87
1 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -3210,41 +3210,44 @@ public class Vpn {
return; return;
} }
if (mSession != null && mMobikeEnabled) { Log.d(TAG, "Schedule a delay handleSessionLost for losing network "
Log.d( + network
TAG, + " on session with token "
"IKE Session has mobility. Delay handleSessionLost for losing network " + mCurrentToken);
+ network
+ " on session with token "
+ mCurrentToken);
final int token = mCurrentToken; final int token = mCurrentToken;
// Delay the teardown in case a new network will be available soon. For example, // Delay the teardown in case a new network will be available soon. For example,
// during handover between two WiFi networks, Android will disconnect from the // during handover between two WiFi networks, Android will disconnect from the
// first WiFi and then connects to the second WiFi. // first WiFi and then connects to the second WiFi.
mScheduledHandleNetworkLostFuture = mScheduledHandleNetworkLostFuture =
mExecutor.schedule( mExecutor.schedule(
() -> { () -> {
if (isActiveToken(token)) { if (isActiveToken(token)) {
handleSessionLost(null /* exception */, network); handleSessionLost(new IkeNetworkLostException(network),
} else { network);
Log.d(
TAG, synchronized (Vpn.this) {
"Scheduled handleSessionLost fired for " // Ignore stale runner.
+ "obsolete token " if (mVpnRunner != this) return;
+ token);
updateState(DetailedState.DISCONNECTED,
"Network lost");
} }
} else {
Log.d(
TAG,
"Scheduled handleSessionLost fired for "
+ "obsolete token "
+ token);
}
// Reset mScheduledHandleNetworkLostFuture since it's
// already run on executor thread.
mScheduledHandleNetworkLostFuture = null;
},
NETWORK_LOST_TIMEOUT_MS,
TimeUnit.MILLISECONDS);
// Reset mScheduledHandleNetworkLostFuture since it's
// already run on executor thread.
mScheduledHandleNetworkLostFuture = null;
},
NETWORK_LOST_TIMEOUT_MS,
TimeUnit.MILLISECONDS);
} else {
Log.d(TAG, "Call handleSessionLost for losing network " + network);
handleSessionLost(null /* exception */, network);
}
} }
private void cancelHandleNetworkLostTimeout() { private void cancelHandleNetworkLostTimeout() {