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 am: 2863db4ac3 am: ef372ecce9

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

Change-Id: I98ed5f628794742c86dcf9596247b74ca7beab07
This commit is contained in:
Lucas Lin
2022-01-05 19:10:12 +00:00
committed by Automerger Merge Worker
parent 5ae5ccf9e3 ef372ecce9
commit 49c7acafd8
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

@@ -1461,7 +1461,10 @@ public class Vpn {
// parameters. If that fails, disconnect. // parameters. If that fails, disconnect.
if (oldConfig != null if (oldConfig != null
&& updateLinkPropertiesInPlaceIfPossible(mNetworkAgent, oldConfig)) { && updateLinkPropertiesInPlaceIfPossible(mNetworkAgent, oldConfig)) {
// Keep mNetworkAgent unchanged // Update underlying networks if it is changed.
if (!Arrays.equals(oldConfig.underlyingNetworks, config.underlyingNetworks)) {
setUnderlyingNetworks(config.underlyingNetworks);
}
} else { } else {
// Initialize the state for a new agent, while keeping the old one connected // Initialize the state for a new agent, while keeping the old one connected
// in case this new connection fails. // in case this new connection fails.