From dc7e3ee3ad86e155284a73e5a2480cde2c793d28 Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Tue, 16 Jul 2013 11:22:32 -0700 Subject: [PATCH] Move markSocketAsUser to the top of IConnectivityManager.aidl Move markSocketAsUser to the top of IConnectivityManager.aidl to make calls from framework/native/services/connectivitymanager less fragile Change-Id: Iba92c21dfef175b570521f34e7ee2732e5a0a9c9 --- core/java/android/net/IConnectivityManager.aidl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 7ee10c3f12..d537b32ff1 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -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);