diff options
| author | 2022-05-20 00:10:36 +0000 | |
|---|---|---|
| committer | 2022-05-20 00:10:36 +0000 | |
| commit | 1f68b323f3a321baa05fa1d9535bc822f6b0438a (patch) | |
| tree | 863b80e52b57eba97c0d87e759178d29bda7cd4f | |
| parent | a4bbe303ffa500ccb04c721b98e16e80a604406e (diff) | |
| parent | 7ba3a378c571a80bb36a4c76f5265d8394db0b6f (diff) | |
Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994
Change-Id: I302b84b9b7fd6bd62dbac6eec2eb37b389a431eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 8f9b5ca26e1b..fd5b46cd0ff7 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -2523,6 +2523,9 @@ public class Vpn { 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 // (non-default) network, and start the new one. resetIkeState(); |