Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d2469d1 authored by Geremy Condra's avatar Geremy Condra Committed by Android (Google) Code Review
Browse files

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

parents dc990e7c d1c87546

core/java/android/net/IConnectivityManager.aidl

+3 −2
Original line number Diff line number Diff line
@@ -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);