diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-05-07 15:27:40 -0400 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2014-07-10 20:39:33 +0000 |
| commit | 6bc2c2c34f2b23eae79ad733c97a691734055c4f (patch) | |
| tree | c52fe08a2ba269f7cb0cdcbef0eeecaec774f07d /services/core/java/com/android/server/connectivity/NetworkMonitor.java | |
| parent | 5952cecc16efad291855bb6a08278ad0f6a4ba95 (diff) | |
| download | frameworks_base-6bc2c2c34f2b23eae79ad733c97a691734055c4f.zip frameworks_base-6bc2c2c34f2b23eae79ad733c97a691734055c4f.tar.gz frameworks_base-6bc2c2c34f2b23eae79ad733c97a691734055c4f.tar.bz2 | |
Convert Vpn from NetworkStateTracker to NetworkAgent.
This eliminates the need for the ConnectivityService.VpnCallback class.
This requires shifting VPNs to the new "network" netd API.
VpnService.protect() is modified to no longer go through ConnectivityService.
NetworkCapabilities is extended to add a transport type for VPNs and a
capability requiring a non-VPN (so the default NetworkRequest isn't satisfied
by a VPN).
bug:15409918
Change-Id: Ic4498f1961582208add6f375ad16ce376ee9eb95
Diffstat (limited to 'services/core/java/com/android/server/connectivity/NetworkMonitor.java')
| -rw-r--r-- | services/core/java/com/android/server/connectivity/NetworkMonitor.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index 0d3b501..6fb8570 100644 --- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java @@ -319,6 +319,9 @@ public class NetworkMonitor extends StateMachine { case CMD_REEVALUATE: if (message.arg1 != mReevaluateToken) break; + if (mNetworkAgentInfo.isVPN()) { + transitionTo(mValidatedState); + } // If network provides no internet connectivity adjust evaluation. if (!mNetworkAgentInfo.networkCapabilities.hasCapability( NetworkCapabilities.NET_CAPABILITY_INTERNET)) { |