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

Commit 4af924d4 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Clear the information of the underlying network" am: c232ead5 am:... 

Merge "Clear the information of the underlying network" am: c232ead5 am: a86d00fa am: 30af21c6

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



Change-Id: I86ae130168b141ae3469b3f3ea0aaf09c522a640
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f614202 30af21c6

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

+2 −0
Original line number Diff line number Diff line
@@ -3254,6 +3254,8 @@ public class Vpn { 
            }



            mActiveNetwork = network;

            mUnderlyingLinkProperties = null;

            mUnderlyingNetworkCapabilities = null;

            mRetryCount = 0;



            startOrMigrateIkeSession(network);