commit 1d5282f4dd960edb5156ae191a1d6cc4cf6072e0
author Lucas Lin <lucaslin@google.com> Thu Mar 31 15:35:53 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 31 15:35:53 2022 +0000
tree 0059a458a3feded3ad6b2c886e633a6db0e0c0db
parent a2b92f89ec176888cc0bf53856793be9d9c54ea6
parent 520cc2fde363dd038911b98b8b46259faf58a659

Merge "Clear mInterface before calling resetIkeState()"

services/core/java/com/android/server/connectivity/Vpn.java

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index a6da4a6..35217db 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -2692,6 +2692,9 @@
                         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();