6bc2c2c34f2b23eae79ad733c97a691734055c4f - platform/frameworks/base

commit	6bc2c2c34f2b23eae79ad733c97a691734055c4f	[log] [tgz]
author	Paul Jensen <pauljensen@google.com>	Wed May 07 15:27:40 2014 -0400
committer	Paul Jensen <pauljensen@google.com>	Thu Jul 10 20:39:33 2014 +0000
tree	c52fe08a2ba269f7cb0cdcbef0eeecaec774f07d
parent	5952cecc16efad291855bb6a08278ad0f6a4ba95 [diff]

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

api/current.txt[diff]
core/java/android/net/IConnectivityManager.aidl[diff]
core/java/android/net/NetworkAgent.java[diff]
core/java/android/net/NetworkCapabilities.java[diff]
core/java/android/net/NetworkUtils.java[diff]
core/java/android/net/UidRange.aidl[Added - diff]
core/java/android/net/UidRange.java[Added - diff]
core/java/android/net/VpnService.java[diff]
core/java/android/os/INetworkManagementService.aidl[diff]
core/jni/android_net_NetUtils.cpp[diff]
services/core/java/com/android/server/ConnectivityService.java[diff]
services/core/java/com/android/server/NetworkManagementService.java[diff]
services/core/java/com/android/server/connectivity/NetworkAgentInfo.java[diff]
services/core/java/com/android/server/connectivity/NetworkMonitor.java[diff]
services/core/java/com/android/server/connectivity/Vpn.java[diff]
services/core/jni/com_android_server_connectivity_Vpn.cpp[diff]

16 files changed

tree: c52fe08a2ba269f7cb0cdcbef0eeecaec774f07d