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

Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3

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

Change-Id: I8ad5f88e34f6d3838bf63f0350af8fe333db850f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Lin
2022-05-20 00:28:57 +00:00
committed by Automerger Merge Worker
parent f6e715f998 1f68b323f3
commit 59378118d7
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2627,6 +2627,9 @@ public class Vpn {
return; // VPN has been shut down. return; // VPN has been shut down.
} }
// Clear mInterface to prevent Ikev2VpnRunner being cleared when
// interfaceRemoved() is called.
mInterface = null;
// Without MOBIKE, we have no way to seamlessly migrate. Close on old // Without MOBIKE, we have no way to seamlessly migrate. Close on old
// (non-default) network, and start the new one. // (non-default) network, and start the new one.
resetIkeState(); resetIkeState();