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

Merge "Clear underlying network info in onDefaultNetworkLost()"

Browse Source
This commit is contained in:
Lucas Lin
2022-12-08 05:30:47 +00:00
committed by Gerrit Code Review
parent f552cf824c 4eac85accf
commit a4ee732c81
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3475,6 +3475,8 @@ public class Vpn {
return; return;
} else { } else {
mActiveNetwork = null; mActiveNetwork = null;
mUnderlyingNetworkCapabilities = null;
mUnderlyingLinkProperties = null;
} }
if (mScheduledHandleNetworkLostFuture != null) { if (mScheduledHandleNetworkLostFuture != null) {
@@ -3664,9 +3666,6 @@ public class Vpn {
scheduleRetryNewIkeSession(); scheduleRetryNewIkeSession();
} }
mUnderlyingNetworkCapabilities = null;
mUnderlyingLinkProperties = null;
// Close all obsolete state, but keep VPN alive incase a usable network comes up. // Close all obsolete state, but keep VPN alive incase a usable network comes up.
// (Mirrors VpnService behavior) // (Mirrors VpnService behavior)
Log.d(TAG, "Resetting state for token: " + mCurrentToken); Log.d(TAG, "Resetting state for token: " + mCurrentToken);