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

Commit 7ba3a378 authored by Lucas Lin's avatar Lucas Lin Committed by Android (Google) Code Review
Browse files

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

parents a70add46 65d44b93

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -2388,6 +2388,9 @@ public class Vpn { 
                        return; // VPN has been shut down.

                        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

                    // Without MOBIKE, we have no way to seamlessly migrate. Close on old

                    // (non-default) network, and start the new one.

                    // (non-default) network, and start the new one.

                    resetIkeState();

                    resetIkeState();