Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move markSocketAsUser to the top of IConnectivityManager.aidl"

Browse Source
This commit is contained in:
Geremy Condra
2013-07-18 02:16:35 +00:00
committed by Android (Google) Code Review
parent dc990e7c61 d1c87546b3
commit 3d2469d19d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/IConnectivityManager.aidl
View File

@@ -37,6 +37,9 @@ import com.android.internal.net.VpnProfile;
/** {@hide} */
interface IConnectivityManager
{
// Keep this in sync with framework/native/services/connectivitymanager/ConnectivityManager.h
void markSocketAsUser(in ParcelFileDescriptor socket, int uid);
void setNetworkPreference(int pref);
int getNetworkPreference();
@@ -119,8 +122,6 @@ interface IConnectivityManager
boolean prepareVpn(String oldPackage, String newPackage);
void markSocketAsUser(in ParcelFileDescriptor socket, int uid);
ParcelFileDescriptor establishVpn(in VpnConfig config);
void startLegacyVpn(in VpnProfile profile);