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

Merge "Remove the reference of new Network(int) in Vpn.java" into sc-dev am: 222a70a77e

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

Change-Id: I77d197590c2f7468871282ad85b7d87ac71acfa2
This commit is contained in:
TreeHugger Robot
2021-03-23 09:24:40 +00:00
committed by Automerger Merge Worker
parent abb595130e 222a70a77e
commit 71a8ad1c81
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1858,22 +1858,13 @@ public class Vpn {
/**
* Updates underlying network set.
*/
public synchronized boolean setUnderlyingNetworks(Network[] networks) {
public synchronized boolean setUnderlyingNetworks(@Nullable Network[] networks) {
if (!isCallerEstablishedOwnerLocked()) {
return false;
}
if (networks == null) {
mConfig.underlyingNetworks = null;
} else {
mConfig.underlyingNetworks = new Network[networks.length];
for (int i = 0; i < networks.length; ++i) {
if (networks[i] == null) {
mConfig.underlyingNetworks[i] = null;
} else {
mConfig.underlyingNetworks[i] = new Network(networks[i].getNetId());
}
}
}
// Make defensive copy since the content of array might be altered by the caller.
mConfig.underlyingNetworks =
(networks != null) ? Arrays.copyOf(networks, networks.length) : null;
mNetworkAgent.setUnderlyingNetworks((mConfig.underlyingNetworks != null)
? Arrays.asList(mConfig.underlyingNetworks) : null);
return true;