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

Commit a4ee732c authored by Lucas Lin's avatar Lucas Lin Committed by Gerrit Code Review
Browse files

Merge "Clear underlying network info in onDefaultNetworkLost()"

parents f552cf82 4eac85ac

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);