diff options
| author | lucaslin <lucaslin@google.com> | 2021-03-22 15:07:41 +0800 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2021-03-23 09:01:40 +0900 |
| commit | ff456d0fc0ba62602a7913694ec4a9b7c9ae0ba8 (patch) | |
| tree | b39ab37dbd8caf053523d4ccaae5875a739aa9db /services/core/java | |
| parent | ab638c1edcce10d47b24aa1f848502c8d8b1cd22 (diff) | |
Have a new method in NetworkAgentConfig.Builder to set allowBypass
Have a new method in NetworkAgentConfig.Builder for Vpn to set
allowBypass.
Bug: 182963397
Test: m
Change-Id: I3f244464438325ee7f8a1b953d3fb28186293628
Diffstat (limited to 'services/core/java')
| -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}); |