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

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

Merge "Update underlying networks if it is changed" am: 9d8001ce am:... 

Merge "Update underlying networks if it is changed" am: 9d8001ce am: 2863db4a am: ef372ecc am: 49c7acaf

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

Change-Id: I73a208178340711db24d978fa98431d69b06535c
parents 42fec8df 49c7acaf

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

+4 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,10 @@ public class Vpn { 
            // parameters. If that fails, disconnect.

            if (oldConfig != null

                    && updateLinkPropertiesInPlaceIfPossible(mNetworkAgent, oldConfig)) {

                // Keep mNetworkAgent unchanged

                // Update underlying networks if it is changed.

                if (!Arrays.equals(oldConfig.underlyingNetworks, config.underlyingNetworks)) {

                    setUnderlyingNetworks(config.underlyingNetworks);

                }

            } else {

                // Initialize the state for a new agent, while keeping the old one connected

                // in case this new connection fails.