Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev

Browse Source
This commit is contained in:
Sreeram Ramachandran
2014-09-11 21:39:07 +00:00
committed by Android (Google) Code Review
parent 6f90967b0c a1e06807ee
commit 623ce7f779
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -17537,14 +17537,12 @@ package android.net {
public class VpnService extends android.app.Service {
ctor public VpnService();
method public boolean addAddress(java.net.InetAddress, int);
method public android.os.IBinder onBind(android.content.Intent);
method public void onRevoke();
method public static android.content.Intent prepare(android.content.Context);
method public boolean protect(int);
method public boolean protect(java.net.Socket);
method public boolean protect(java.net.DatagramSocket);
method public boolean removeAddress(java.net.InetAddress, int);
field public static final java.lang.String SERVICE_INTERFACE = "android.net.VpnService";
}

4
core/java/android/net/VpnService.java
View File

@@ -212,6 +212,8 @@ public class VpnService extends Service {
*
* @return {@code true} on success.
* @see Builder#addAddress
*
* @hide
*/
public boolean addAddress(InetAddress address, int prefixLength) {
check(address, prefixLength);
@@ -240,6 +242,8 @@ public class VpnService extends Service {
* @param prefixLength The prefix length of the address.
*
* @return {@code true} on success.
*
* @hide
*/
public boolean removeAddress(InetAddress address, int prefixLength) {
check(address, prefixLength);