Merge "Add API for VPN apps to query always-on and lockdown." am: 5e135e2bdc

am: d332a50c1f Change-Id: I48f3441f06af2a69776eacc5ee52463873739bdb
2019-01-22 07:09:43 -08:00
parent 8e3c713db0 d332a50c1f
commit 8bfc3feb3f
3 changed files with 59 additions and 9 deletions
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -187,4 +187,6 @@ interface IConnectivityManager
    byte[] getNetworkWatchlistConfigHash();

    int getConnectionOwnerUid(in ConnectionInfo connectionInfo);
+    boolean isCallerCurrentAlwaysOnVpnApp();
+    boolean isCallerCurrentAlwaysOnVpnLockdownApp();
 }