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

Merge "Fix VPN retry timer mechanism"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-03 12:35:12 +00:00
committed by Gerrit Code Review
parent 79605eb994 849bbda37d
commit 78b6cfbe4d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2928,7 +2928,6 @@ public class Vpn {
ikeConfiguration.isIkeExtensionEnabled( ikeConfiguration.isIkeExtensionEnabled(
IkeSessionConfiguration.EXTENSION_TYPE_MOBIKE); IkeSessionConfiguration.EXTENSION_TYPE_MOBIKE);
onIkeConnectionInfoChanged(token, ikeConfiguration.getIkeSessionConnectionInfo()); onIkeConnectionInfoChanged(token, ikeConfiguration.getIkeSessionConnectionInfo());
mRetryCount = 0;
} }
/** /**
@@ -3048,6 +3047,7 @@ public class Vpn {
} }
doSendLinkProperties(networkAgent, lp); doSendLinkProperties(networkAgent, lp);
mRetryCount = 0;
} catch (Exception e) { } catch (Exception e) {
Log.d(TAG, "Error in ChildOpened for token " + token, e); Log.d(TAG, "Error in ChildOpened for token " + token, e);
onSessionLost(token, e); onSessionLost(token, e);
@@ -3345,6 +3345,10 @@ public class Vpn {
} }
private void scheduleRetryNewIkeSession() { private void scheduleRetryNewIkeSession() {
if (mScheduledHandleRetryIkeSessionFuture != null) {
Log.d(TAG, "There is a pending retrying task, skip the new retrying task");
return;
}
final long retryDelay = mDeps.getNextRetryDelaySeconds(mRetryCount++); final long retryDelay = mDeps.getNextRetryDelaySeconds(mRetryCount++);
Log.d(TAG, "Retry new IKE session after " + retryDelay + " seconds."); Log.d(TAG, "Retry new IKE session after " + retryDelay + " seconds.");
// If the default network is lost during the retry delay, the mActiveNetwork will be // If the default network is lost during the retry delay, the mActiveNetwork will be