diff options
| author | 2022-05-20 02:34:25 +0000 | |
|---|---|---|
| committer | 2022-05-20 02:34:25 +0000 | |
| commit | 2eb95344c58a0a4f496662875bbf76e9d5cb134c (patch) | |
| tree | 8db1e4d7b95b4dd5b68de6deacb578d475dfcacc | |
| parent | 1d46810cc2e3d826dc6f6e2a70359ea56d16c23a (diff) | |
| parent | 6b1bf26b0b2adcae2fa5390d01a4d3f1c4993cf7 (diff) | |
Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994
Change-Id: I3fa32ef295e36ff6e991378ae75cb21ca2769d38
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 1bd158dfe96e..637af427729e 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -2627,6 +2627,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(); |