diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-08-25 00:05:46 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-08-27 12:35:05 -0700 |
| commit | 69ddab4575ff684c533c995e07ca15fe18543fc0 (patch) | |
| tree | dfae3a89b9027c33d47b58f80200af021bbe7426 /services/java/com/android/server/NetworkManagementService.java | |
| parent | 080ca09c7f4c0033d0efece23687b71f7f8febc9 (diff) | |
Always-on VPN.
Adds support for always-on VPN profiles, also called "lockdown." When
enabled, LockdownVpnTracker manages the netd firewall to prevent
unencrypted traffic from leaving the device. It creates narrow rules
to only allow traffic to the selected VPN server. When an egress
network becomes available, LockdownVpnTracker will try bringing up
the VPN connection, and will reconnect if disconnected.
ConnectivityService augments any NetworkInfo based on the lockdown
VPN status to help apps wait until the VPN is connected.
This feature requires that VPN profiles use an IP address for both
VPN server and DNS. It also blocks non-default APN access when
enabled. Waits for USER_PRESENT after boot to check KeyStore status.
Bug: 5756357
Change-Id: If615f206b1634000d78a8350a17e88bfcac8e0d0
Diffstat (limited to 'services/java/com/android/server/NetworkManagementService.java')
| -rw-r--r-- | services/java/com/android/server/NetworkManagementService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java index fbd45a042d53..efa16af2942a 100644 --- a/services/java/com/android/server/NetworkManagementService.java +++ b/services/java/com/android/server/NetworkManagementService.java @@ -58,6 +58,7 @@ import android.util.SparseBooleanArray; import com.android.internal.net.NetworkStatsFactory; import com.android.internal.util.Preconditions; import com.android.server.NativeDaemonConnector.Command; +import com.android.server.net.LockdownVpnTracker; import com.google.android.collect.Maps; import java.io.BufferedReader; @@ -370,7 +371,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub } // TODO: Push any existing firewall state - setFirewallEnabled(mFirewallEnabled); + setFirewallEnabled(mFirewallEnabled || LockdownVpnTracker.isEnabled()); } // |