c2c0beab79a907f63e109eefe2a5aabcf2e3fd8f - fp2-dev/platform/frameworks/base

commit	c2c0beab79a907f63e109eefe2a5aabcf2e3fd8f	[log] [tgz]
author	Sreeram Ramachandran <sreeram@google.com>	Tue Nov 11 16:09:21 2014 -0800
committer	Sreeram Ramachandran <sreeram@google.com>	Fri Nov 21 09:26:18 2014 -0800
tree	a0a879c50b307f171dd2b0dc3a5abcb2be4afbc1
parent	21b5ee3f0e39be4a79bcfb2b79b0529f75f5cb58 [diff]

Allow VPNs to specify their underlying networks.

These are used when responding to getActiveNetworkInfo() (and cousins)
when an app is subject to the VPN.

Bug: 17460017
Change-Id: Ief7a840c760777a41d3358aa6b8e4cdd99c29f24

api/current.txt[diff]
core/java/android/net/IConnectivityManager.aidl[diff]
core/java/android/net/VpnService.java[diff]
core/java/com/android/internal/net/VpnConfig.java[diff]
services/core/java/com/android/server/ConnectivityService.java[diff]
services/core/java/com/android/server/connectivity/Vpn.java[diff]

6 files changed

tree: a0a879c50b307f171dd2b0dc3a5abcb2be4afbc1