diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-12 23:49:15 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-13 00:04:10 -0700 |
| commit | db64454b3354e26c96fdb83a4443cce12e352640 (patch) | |
| tree | f0138835e5ddd3595c732e09dd8145bd19eb1e1e /core/java/android/net/IConnectivityManager.aidl | |
| parent | 28070f43a64069a95f7cb2e5c463bdee41e58294 (diff) | |
| parent | b6b9fe216d4dab6249e77870a02589e58d6bc59f (diff) | |
| download | frameworks_base-db64454b3354e26c96fdb83a4443cce12e352640.zip frameworks_base-db64454b3354e26c96fdb83a4443cce12e352640.tar.gz frameworks_base-db64454b3354e26c96fdb83a4443cce12e352640.tar.bz2 | |
resolved conflicts for merge of b6b9fe21 to master
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
Diffstat (limited to 'core/java/android/net/IConnectivityManager.aidl')
| -rw-r--r-- | core/java/android/net/IConnectivityManager.aidl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index da79b1a..3c09978 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -103,8 +103,6 @@ interface IConnectivityManager ProxyInfo getDefaultProxy(); - void setDataDependency(int networkType, boolean met); - boolean prepareVpn(String oldPackage, String newPackage); void setVpnPackageAuthorization(boolean authorized); @@ -123,8 +121,6 @@ interface IConnectivityManager void captivePortalCheckCompleted(in NetworkInfo info, boolean isCaptivePortal); - void supplyMessenger(int networkType, in Messenger messenger); - int findConnectionTypeForIface(in String iface); int checkMobileProvisioning(int suggestedTimeOutMs); |