Merge "Update underlying networks if it is changed"

2022-01-05 03:21:45 +00:00
parent 884e5d8456 b4038a5b88
commit 9d8001cea1
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -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.