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

Commit 49c87efa authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Clear underlying network info in onDefaultNetworkLost()" am: a4ee732c... 

Merge "Clear underlying network info in onDefaultNetworkLost()" am: a4ee732c am: 88c8af5a am: 94a93e3b

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



Change-Id: If0e7d941c7697778e218a2135f176ad878723e84
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fdc3922 94a93e3b

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

+2 −3
Original line number Diff line number Diff line
@@ -3475,6 +3475,8 @@ public class Vpn { 
                return;

            } else {

                mActiveNetwork = null;

                mUnderlyingNetworkCapabilities = null;

                mUnderlyingLinkProperties = null;

            }



            if (mScheduledHandleNetworkLostFuture != null) {
@@ -3664,9 +3666,6 @@ public class Vpn { 
                scheduleRetryNewIkeSession();

            }



            mUnderlyingNetworkCapabilities = null;

            mUnderlyingLinkProperties = null;



            // Close all obsolete state, but keep VPN alive incase a usable network comes up.

            // (Mirrors VpnService behavior)

            Log.d(TAG, "Resetting state for token: " + mCurrentToken);