diff options
| author | Sreeram Ramachandran <sreeram@google.com> | 2014-11-11 16:09:21 -0800 |
|---|---|---|
| committer | Sreeram Ramachandran <sreeram@google.com> | 2014-11-21 09:26:18 -0800 |
| commit | c2c0beab79a907f63e109eefe2a5aabcf2e3fd8f (patch) | |
| tree | a0a879c50b307f171dd2b0dc3a5abcb2be4afbc1 /api/current.txt | |
| parent | 21b5ee3f0e39be4a79bcfb2b79b0529f75f5cb58 (diff) | |
| download | frameworks_base-c2c0beab79a907f63e109eefe2a5aabcf2e3fd8f.zip frameworks_base-c2c0beab79a907f63e109eefe2a5aabcf2e3fd8f.tar.gz frameworks_base-c2c0beab79a907f63e109eefe2a5aabcf2e3fd8f.tar.bz2 | |
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
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index d25ae96..b5c876b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17443,6 +17443,7 @@ package android.net { method public boolean protect(int); method public boolean protect(java.net.Socket); method public boolean protect(java.net.DatagramSocket); + method public boolean setUnderlyingNetworks(android.net.Network[]); field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService"; } @@ -17464,6 +17465,7 @@ package android.net { method public android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent); method public android.net.VpnService.Builder setMtu(int); method public android.net.VpnService.Builder setSession(java.lang.String); + method public android.net.VpnService.Builder setUnderlyingNetworks(android.net.Network[]); } } |