Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e943a04 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Clear mInterface before calling resetIkeState()" am: 1d5282f4 am:... 

Merge "Clear mInterface before calling resetIkeState()" am: 1d5282f4 am: a093773c am: c5bdf9b7

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



Change-Id: Ie7be19d0bdf79049bdb124e60da62561bbd6c201
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a66381ab c5bdf9b7

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

+3 −0
Original line number Diff line number Diff line
@@ -2692,6 +2692,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();