commit d1c87546b37658fbc38cb33504cc726a07e0c4ea
author Chad Brubaker <cbrubaker@google.com> Tue Jul 16 11:22:32 2013 -0700
committer Chad Brubaker <cbrubaker@google.com> Tue Jul 16 11:29:11 2013 -0700
tree 6175c4ba2ce03c20ededa8a75082a5ec9f61bebe
parent ef691179799c11eceea0f118f79a32c47ca9ae96

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

diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index 7ee10c3..d537b32 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -37,6 +37,9 @@
 /** {@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 @@
 
     boolean prepareVpn(String oldPackage, String newPackage);
 
-    void markSocketAsUser(in ParcelFileDescriptor socket, int uid);
-
     ParcelFileDescriptor establishVpn(in VpnConfig config);
 
     void startLegacyVpn(in VpnProfile profile);