diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-03-23 04:40:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-23 04:40:50 +0000 |
| commit | 14f7c0273f4d5ecb26aa241a85b61bd2719b4d24 (patch) | |
| tree | c7878f029d5a972bb4b81f7c5a84ac83d4537614 /services/core | |
| parent | 82ac7c4eeb1fbfd8998d6a9f4f817abf9326cfbe (diff) | |
| parent | ff456d0fc0ba62602a7913694ec4a9b7c9ae0ba8 (diff) | |
Merge "Have a new method in NetworkAgentConfig.Builder to set allowBypass"
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 30e0c7e9b9aa..7dad9e083067 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -1242,8 +1242,9 @@ public class Vpn { mLegacyState = LegacyVpnInfo.STATE_CONNECTING; updateState(DetailedState.CONNECTING, "agentConnect"); - NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder().build(); - networkAgentConfig.allowBypass = mConfig.allowBypass && !mLockdown; + final NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig.Builder() + .setBypassableVpn(mConfig.allowBypass && !mLockdown) + .build(); mNetworkCapabilities.setOwnerUid(mOwnerUID); mNetworkCapabilities.setAdministratorUids(new int[] {mOwnerUID}); |