commit e45863205954b078870bfd7611b10a7e3e8aff09
author Sreeram Ramachandran <sreeram@google.com> Sun Jul 27 14:18:26 2014 -0700
committer Sreeram Ramachandran <sreeram@google.com> Tue Jul 29 00:32:59 2014 +0000
tree 807fd9657dc402e1bfe75c3ac0f37b8c24ae72e0
parent 00c1c93a3e88f1075d18204711e9c22e0007ae5d

Allow VPNs to add/remove link addresses dynamically.

Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8

core/java/android/net/IConnectivityManager.aidl

diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index 671df24..0814e0f 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -163,4 +163,7 @@
     void releaseNetworkRequest(in NetworkRequest networkRequest);
 
     int getRestoreDefaultNetworkDelay(int networkType);
+
+    boolean addVpnAddress(String address, int prefixLength);
+    boolean removeVpnAddress(String address, int prefixLength);
 }

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 55070bb..428d857 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5351,4 +5351,22 @@
         }
         return new NetworkCapabilities();
     }
+
+    @Override
+    public boolean addVpnAddress(String address, int prefixLength) {
+        throwIfLockdownEnabled();
+        int user = UserHandle.getUserId(Binder.getCallingUid());
+        synchronized (mVpns) {
+            return mVpns.get(user).addAddress(address, prefixLength);
+        }
+    }
+
+    @Override
+    public boolean removeVpnAddress(String address, int prefixLength) {
+        throwIfLockdownEnabled();
+        int user = UserHandle.getUserId(Binder.getCallingUid());
+        synchronized (mVpns) {
+            return mVpns.get(user).removeAddress(address, prefixLength);
+        }
+    }
 }