Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I15b7340347241e89d20fda862293a56c06502a02
This commit is contained in:
Lucas Lin
2022-01-05 03:44:37 +00:00
committed by Automerger Merge Worker
parent b759da54a3 9d8001cea1
commit 2863db4ac3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -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.