commit a462bcb9c477a2c33611560c2e8182917c5bf5b9
author Pavel Grafov <pgrafov@google.com> Fri Jan 25 08:50:06 2019 +0000
committer Pavel Grafov <pgrafov@google.com> Fri Jan 25 19:59:03 2019 +0000
tree ff9f4bfcb8b5e78803adba0901178aecfcd6d067
parent 5e823ab263f779b566960a66c2eb9e4d511c598f

Whitelist packages from VPN lockdown.

Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I9119c139ab07a761ce5dfd1365b70eb905fd32dc

core/java/android/net/IConnectivityManager.aidl

diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index e97060a..fd7360f 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -125,8 +125,11 @@
 
     boolean updateLockdownVpn();
     boolean isAlwaysOnVpnPackageSupported(int userId, String packageName);
-    boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdown);
+    boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdown,
+            in List<String> lockdownWhitelist);
     String getAlwaysOnVpnPackage(int userId);
+    boolean isVpnLockdownEnabled(int userId);
+    List<String> getVpnLockdownWhitelist(int userId);
 
     int checkMobileProvisioning(int suggestedTimeOutMs);