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

Commit 6bc2c2c3 authored by Paul Jensen's avatar Paul Jensen
Browse files

Convert Vpn from NetworkStateTracker to NetworkAgent. 

This eliminates the need for the ConnectivityService.VpnCallback class.
This requires shifting VPNs to the new "network" netd API.
VpnService.protect() is modified to no longer go through ConnectivityService.
NetworkCapabilities is extended to add a transport type for VPNs and a
capability requiring a non-VPN (so the default NetworkRequest isn't satisfied
by a VPN).

bug:15409918
Change-Id: Ic4498f1961582208add6f375ad16ce376ee9eb95
parent 5952cecc

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -16506,6 +16506,7 @@ package android.net { 
    field public static final int NET_CAPABILITY_MMS = 0; // 0x0

    field public static final int NET_CAPABILITY_NOT_METERED = 11; // 0xb

    field public static final int NET_CAPABILITY_NOT_RESTRICTED = 13; // 0xd

    field public static final int NET_CAPABILITY_NOT_VPN = 15; // 0xf

    field public static final int NET_CAPABILITY_RCS = 8; // 0x8

    field public static final int NET_CAPABILITY_SUPL = 1; // 0x1

    field public static final int NET_CAPABILITY_TRUSTED = 14; // 0xe
@@ -16514,6 +16515,7 @@ package android.net { 
    field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2

    field public static final int TRANSPORT_CELLULAR = 0; // 0x0

    field public static final int TRANSPORT_ETHERNET = 3; // 0x3

    field public static final int TRANSPORT_VPN = 4; // 0x4

    field public static final int TRANSPORT_WIFI = 1; // 0x1

  }

























core/java/android/net/IConnectivityManager.aidl



+0
−2




























Original line number
Diff line number
Diff line








@@ -115,8 +115,6 @@ interface IConnectivityManager





























    void setDataDependency(int networkType, boolean met);





























    boolean protectVpn(in ParcelFileDescriptor socket);





























    boolean prepareVpn(String oldPackage, String newPackage);































    ParcelFileDescriptor establishVpn(in VpnConfig config);

































core/java/android/net/NetworkAgent.java



+30
−0




























Original line number
Diff line number
Diff line








@@ -92,6 +92,20 @@ public abstract class NetworkAgent extends Handler {













     */















    public static final int EVENT_NETWORK_SCORE_CHANGED = BASE + 4;





























    /**













     * Sent by the NetworkAgent to ConnectivityService to add new UID ranges













     * to be forced into this Network.  For VPNs only.













     * obj = UidRange[] to forward













     */













    public static final int EVENT_UID_RANGES_ADDED = BASE + 5;



























    /**













     * Sent by the NetworkAgent to ConnectivityService to remove UID ranges













     * from being forced into this Network.  For VPNs only.













     * obj = UidRange[] to stop forwarding













     */













    public static final int EVENT_UID_RANGES_REMOVED = BASE + 6;





























    public NetworkAgent(Looper looper, Context context, String logTag, NetworkInfo ni,















            NetworkCapabilities nc, LinkProperties lp, int score) {















        super(looper);










@@ -193,6 +207,22 @@ public abstract class NetworkAgent extends Handler {













        queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, new Integer(score));















    }





























    /**













     * Called by the VPN code when it wants to add ranges of UIDs to be routed













     * through the VPN network.













     */













    public void addUidRanges(UidRange[] ranges) {













        queueOrSendMessage(EVENT_UID_RANGES_ADDED, ranges);













    }



























    /**













     * Called by the VPN code when it wants to remove ranges of UIDs from being routed













     * through the VPN network.













     */













    public void removeUidRanges(UidRange[] ranges) {













        queueOrSendMessage(EVENT_UID_RANGES_REMOVED, ranges);













    }





























    /**















     * Called when ConnectivityService has indicated they no longer want this network.















     * The parent factory should (previously) have received indication of the change

































core/java/android/net/NetworkCapabilities.java



+16
−3




























Original line number
Diff line number
Diff line








@@ -64,7 +64,7 @@ public final class NetworkCapabilities implements Parcelable {













     * by any Network that matches all of them.















     */















    private long mNetworkCapabilities = (1 << NET_CAPABILITY_NOT_RESTRICTED) |













            (1 << NET_CAPABILITY_TRUSTED);













            (1 << NET_CAPABILITY_TRUSTED) | (1 << NET_CAPABILITY_NOT_VPN);































    /**















     * Indicates this is a network that has the ability to reach the










@@ -158,9 +158,15 @@ public final class NetworkCapabilities implements Parcelable {













     */















    public static final int NET_CAPABILITY_TRUSTED        = 14;





























    /*













     * Indicates that this network is not a VPN.  This capability is set by default and should be













     * explicitly cleared when creating VPN networks.













     */













    public static final int NET_CAPABILITY_NOT_VPN        = 15;













































    private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;













    private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_TRUSTED;













    private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_NOT_VPN;































    /**















     * Adds the given capability to this {@code NetworkCapability} instance.










@@ -271,8 +277,13 @@ public final class NetworkCapabilities implements Parcelable {













     */















    public static final int TRANSPORT_ETHERNET = 3;





























    /**













     * Indicates this network uses a VPN transport.













     */













    public static final int TRANSPORT_VPN = 4;





























    private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;













    private static final int MAX_TRANSPORT = TRANSPORT_ETHERNET;













    private static final int MAX_TRANSPORT = TRANSPORT_VPN;































    /**















     * Adds the given transport type to this {@code NetworkCapability} instance.










@@ -500,6 +511,7 @@ public final class NetworkCapabilities implements Parcelable {













                case TRANSPORT_WIFI:        transports += "WIFI"; break;















                case TRANSPORT_BLUETOOTH:   transports += "BLUETOOTH"; break;















                case TRANSPORT_ETHERNET:    transports += "ETHERNET"; break;













                case TRANSPORT_VPN:         transports += "VPN"; break;















            }















            if (++i < types.length) transports += "|";















        }









@@ -523,6 +535,7 @@ public final class NetworkCapabilities implements Parcelable {













                case NET_CAPABILITY_INTERNET:       capabilities += "INTERNET"; break;















                case NET_CAPABILITY_NOT_RESTRICTED: capabilities += "NOT_RESTRICTED"; break;















                case NET_CAPABILITY_TRUSTED:        capabilities += "TRUSTED"; break;













                case NET_CAPABILITY_NOT_VPN:        capabilities += "NOT_VPN"; break;















            }















            if (++i < types.length) capabilities += "&";















        }

































core/java/android/net/NetworkUtils.java



+7
−0




























Original line number
Diff line number
Diff line








@@ -154,6 +154,13 @@ public class NetworkUtils {













     */















    public native static boolean bindSocketToNetwork(int socketfd, int netId);





























    /**













     * Protect {@code socketfd} from VPN connections.  After protecting, data sent through













     * this socket will go directly to the underlying network, so its traffic will not be













     * forwarded through the VPN.













     */













    public native static boolean protectFromVpn(int socketfd);





























    /**















     * Convert a IPv4 address from an integer to an InetAddress.















     * @param hostAddress an int corresponding to the IPv4 address in network byte order