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

Merge "Clear underlying network info in onDefaultNetworkLost()" am: a4ee732c81

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

Change-Id: Ie55da2db695e9899f93fe5ae0415eb34e3d6e82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Lin
2022-12-08 05:56:40 +00:00
committed by Automerger Merge Worker
parent 6975b68d32 a4ee732c81
commit 88c8af5a65
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);