diff options
| author | Robin Lee <rgl@google.com> | 2015-07-10 19:47:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 19:47:12 +0000 |
| commit | 81093dd04bc1fdfe1f7389baefb891122e232ff9 (patch) | |
| tree | 6b81658f271efb0f8ef9de8482b7a6ce35b481fa /core/java/android | |
| parent | c10176a419b4b95a64d9d20e5137c545a4472747 (diff) | |
| parent | 51cfb3a4d6f59824ba503a0e7f0190e08ede8621 (diff) | |
am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit '51cfb3a4d6f59824ba503a0e7f0190e08ede8621':
Legacy VPN calls to require a userID
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/IConnectivityManager.aidl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 78f8b95fbbfd..46c28a69ab6f 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -112,7 +112,7 @@ interface IConnectivityManager void startLegacyVpn(in VpnProfile profile); - LegacyVpnInfo getLegacyVpnInfo(); + LegacyVpnInfo getLegacyVpnInfo(int userId); VpnInfo[] getAllVpnInfo(); |