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

Commit 2eb95344 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am:... 

Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378 am: 1f68b323 am: 59378118 am: 6b1bf26b

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



Change-Id: I3fa32ef295e36ff6e991378ae75cb21ca2769d38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d46810c 6b1bf26b

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

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