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

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

Merge "Update underlying networks if it is changed"

parents 884e5d84 b4038a5b

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

+4 −1
Original line number Diff line number Diff line
@@ -1446,7 +1446,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.