Merge changes I446a8595,I68d2293f am: 3914abccce am: 3f8a000e5c am: dd8b4569b6

Change-Id: I99a531ab5ed8645d3eb3d15a3cd4ed6ef30c89ab
2020-02-03 22:53:15 +00:00
parent 509cf84538 dd8b4569b6
commit 23976cad40
4 changed files with 331 additions and 30 deletions
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -121,6 +121,14 @@ interface IConnectivityManager

    ParcelFileDescriptor establishVpn(in VpnConfig config);

+    boolean provisionVpnProfile(in VpnProfile profile, String packageName);
+
+    void deleteVpnProfile(String packageName);
+
+    void startVpnProfile(String packageName);
+
+    void stopVpnProfile(String packageName);
+
    VpnConfig getVpnConfig(int userId);

    @UnsupportedAppUsage