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

Commit cc7f1db9 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Stop using netd parcelables in the framework. 

The only actual users of these classes are in services.jar, not
in frameworks.jar. The only reason the framework depends on them
is that the code that converts to and from stable parcelables is
currently in the framework. Move that code to services and cut
the dependency.

These classes aren't used in the networkstack app so they don't
need to be in shared. They also can't be in shared because the
classes are not in the SDK. So put the conversion functions
directly inside their only user (NetworkManagementService).

Also remove the jarjar rules that rename the classes for use by
the NetworkStack app.

This does not actually remove the dependency from the build file,
that will be done in a future CL.

Bug: 128804404
Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest HostsideVpnTests
Change-Id: I027d50ba56091f5558f45e6e08f32e5912b2a82a
parent 94901271

core/java/android/net/InterfaceConfiguration.java

+0 −36
Original line number Original line Diff line number Diff line
@@ -19,11 +19,9 @@ package android.net; 
import android.annotation.UnsupportedAppUsage;

import android.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.text.TextUtils;





import com.google.android.collect.Sets;

import com.google.android.collect.Sets;





import java.net.InetAddress;

import java.util.HashSet;

import java.util.HashSet;





/**

/**
@@ -116,40 +114,6 @@ public class InterfaceConfiguration implements Parcelable { 
        mHwAddr = hwAddr;

        mHwAddr = hwAddr;

    }

    }





    /**

     * Construct InterfaceConfiguration from InterfaceConfigurationParcel.

     */

    public static InterfaceConfiguration fromParcel(InterfaceConfigurationParcel p) {

        InterfaceConfiguration cfg = new InterfaceConfiguration();

        cfg.setHardwareAddress(p.hwAddr);



        final InetAddress addr = NetworkUtils.numericToInetAddress(p.ipv4Addr);

        cfg.setLinkAddress(new LinkAddress(addr, p.prefixLength));

        for (String flag : p.flags) {

            cfg.setFlag(flag);

        }



        return cfg;

    }



    /**

     * Convert InterfaceConfiguration to InterfaceConfigurationParcel with given ifname.

     */

    public InterfaceConfigurationParcel toParcel(String iface) {

        InterfaceConfigurationParcel cfgParcel = new InterfaceConfigurationParcel();

        cfgParcel.ifName = iface;

        if (!TextUtils.isEmpty(mHwAddr)) {

            cfgParcel.hwAddr = mHwAddr;

        } else {

            cfgParcel.hwAddr = "";

        }

        cfgParcel.ipv4Addr = mAddr.getAddress().getHostAddress();

        cfgParcel.prefixLength = mAddr.getPrefixLength();

        cfgParcel.flags = mFlags.toArray(EMPTY_STRING_ARRAY);



        return cfgParcel;

    }



    /**

    /**

     * This function determines if the interface is up and has a valid IP

     * This function determines if the interface is up and has a valid IP

     * configuration (IP address has a non zero octet).

     * configuration (IP address has a non zero octet).

core/java/android/net/UidRange.java

+22 −9
Original line number Original line Diff line number Diff line
@@ -19,14 +19,17 @@ package android.net; 
import static android.os.UserHandle.PER_USER_RANGE;

import static android.os.UserHandle.PER_USER_RANGE;





import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;





/**

/**

 * An inclusive range of UIDs.

 * An inclusive range of UIDs.

 *

 *

 * @hide

 * @hide

 */

 */

public final class UidRange extends UidRangeParcel {

public final class UidRange implements Parcelable {

    private UidRange() {}

    public final int start;

    public final int stop;



    public UidRange(int startUid, int stopUid) {

    public UidRange(int startUid, int stopUid) {

        if (startUid < 0) throw new IllegalArgumentException("Invalid start UID.");

        if (startUid < 0) throw new IllegalArgumentException("Invalid start UID.");

        if (stopUid < 0) throw new IllegalArgumentException("Invalid stop UID.");

        if (stopUid < 0) throw new IllegalArgumentException("Invalid stop UID.");
@@ -86,18 +89,28 @@ public final class UidRange extends UidRangeParcel { 
        return start + "-" + stop;

        return start + "-" + stop;

    }

    }





    /**

    // Implement the Parcelable interface

     * DO NOT override "writeToParcel" and "readFromParcel" in this class.

    // TODO: Consider making this class no longer parcelable, since all users are likely in the

     * The parceling code is autogenerated by the superclass.

    // system server.

     */

    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(start);

        dest.writeInt(stop);

    }





    public static final @android.annotation.NonNull Creator<UidRange> CREATOR =

    public static final @android.annotation.NonNull Creator<UidRange> CREATOR =

        new Creator<UidRange>() {

        new Creator<UidRange>() {

            @Override

            @Override

            public UidRange createFromParcel(Parcel in) {

            public UidRange createFromParcel(Parcel in) {

                UidRange obj = new UidRange();

                int start = in.readInt();

                obj.readFromParcel(in);

                int stop = in.readInt();

                return obj;



                return new UidRange(start, stop);

            }

            }

            @Override

            @Override

            public UidRange[] newArray(int size) {

            public UidRange[] newArray(int size) {

packages/NetworkStack/jarjar-rules-shared.txt

+1 −7
Original line number Original line Diff line number Diff line
@@ -9,11 +9,5 @@ rule android.net.DhcpResultsParcelable* @0 
rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1

rule android.net.DhcpResults* android.net.networkstack.DhcpResults@1

rule android.net.LocalLog* android.net.networkstack.LocalLog@1

rule android.net.LocalLog* android.net.networkstack.LocalLog@1





# TODO: remove from framework dependencies, then remove here

rule android.net.InterfaceConfigurationParcel* android.net.networkstack.InterfaceConfigurationParcel@1

rule android.net.TetherStatsParcel* android.net.networkstack.TetherStatsParcel@1



# Used by UidRange, which is used by framework classes such as NetworkCapabilities.

rule android.net.UidRangeParcel* android.net.networkstack.UidRangeParcel@1

# TODO: move TcpKeepalivePacketData to services.net and delete

# TODO: move TcpKeepalivePacketData to services.net and delete

rule android.net.TcpKeepalivePacketDataParcelable* android.net.networkstack.TcpKeepalivePacketDataParcelable@1
 
rule android.net.TcpKeepalivePacketDataParcelable* android.net.networkstack.TcpKeepalivePacketDataParcelable@1

services/core/java/com/android/server/NetworkManagementService.java

+67 −10
Original line number Original line Diff line number Diff line
@@ -62,6 +62,7 @@ import android.net.NetworkUtils; 
import android.net.RouteInfo;

import android.net.RouteInfo;

import android.net.TetherStatsParcel;

import android.net.TetherStatsParcel;

import android.net.UidRange;

import android.net.UidRange;

import android.net.UidRangeParcel;

import android.net.util.NetdService;

import android.net.util.NetdService;

import android.os.BatteryStats;

import android.os.BatteryStats;

import android.os.Binder;

import android.os.Binder;
@@ -80,6 +81,7 @@ import android.os.SystemClock; 
import android.os.SystemProperties;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.Trace;

import android.telephony.DataConnectionRealTimeInfo;

import android.telephony.DataConnectionRealTimeInfo;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.SparseBooleanArray;

import android.util.SparseBooleanArray;
@@ -1028,6 +1030,46 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        }

        }

    }

    }





    /**

     * Convert InterfaceConfiguration to InterfaceConfigurationParcel with given ifname.

     */

    private static InterfaceConfigurationParcel toStableParcel(InterfaceConfiguration cfg,

            String iface) {

        InterfaceConfigurationParcel cfgParcel = new InterfaceConfigurationParcel();

        cfgParcel.ifName = iface;

        String hwAddr = cfg.getHardwareAddress();

        if (!TextUtils.isEmpty(hwAddr)) {

            cfgParcel.hwAddr = hwAddr;

        } else {

            cfgParcel.hwAddr = "";

        }

        cfgParcel.ipv4Addr = cfg.getLinkAddress().getAddress().getHostAddress();

        cfgParcel.prefixLength = cfg.getLinkAddress().getPrefixLength();

        ArrayList<String> flags = new ArrayList<>();

        for (String flag : cfg.getFlags()) {

            flags.add(flag);

        }

        cfgParcel.flags = flags.toArray(new String[0]);



        return cfgParcel;

    }



    /**

     * Construct InterfaceConfiguration from InterfaceConfigurationParcel.

     */

    public static InterfaceConfiguration fromStableParcel(InterfaceConfigurationParcel p) {

        InterfaceConfiguration cfg = new InterfaceConfiguration();

        cfg.setHardwareAddress(p.hwAddr);



        final InetAddress addr = NetworkUtils.numericToInetAddress(p.ipv4Addr);

        cfg.setLinkAddress(new LinkAddress(addr, p.prefixLength));

        for (String flag : p.flags) {

            cfg.setFlag(flag);

        }



        return cfg;

    }



    @Override

    @Override

    public InterfaceConfiguration getInterfaceConfig(String iface) {

    public InterfaceConfiguration getInterfaceConfig(String iface) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
@@ -1039,7 +1081,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        }

        }





        try {

        try {

            final InterfaceConfiguration cfg = InterfaceConfiguration.fromParcel(result);

            final InterfaceConfiguration cfg = fromStableParcel(result);

            return cfg;

            return cfg;

        } catch (IllegalArgumentException iae) {

        } catch (IllegalArgumentException iae) {

            throw new IllegalStateException("Invalid InterfaceConfigurationParcel", iae);

            throw new IllegalStateException("Invalid InterfaceConfigurationParcel", iae);
@@ -1054,7 +1096,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
            throw new IllegalStateException("Null LinkAddress given");

            throw new IllegalStateException("Null LinkAddress given");

        }

        }





        final InterfaceConfigurationParcel cfgParcel = cfg.toParcel(iface);

        final InterfaceConfigurationParcel cfgParcel = toStableParcel(cfg, iface);





        try {

        try {

            mNetdService.interfaceSetCfg(cfgParcel);

            mNetdService.interfaceSetCfg(cfgParcel);
@@ -1718,12 +1760,27 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        }

        }

    }

    }





    private static UidRangeParcel makeUidRangeParcel(int start, int stop) {

        UidRangeParcel range = new UidRangeParcel();

        range.start = start;

        range.stop = stop;

        return range;

    }



    private static UidRangeParcel[] toStableParcels(UidRange[] ranges) {

        UidRangeParcel[] stableRanges = new UidRangeParcel[ranges.length];

        for (int i = 0; i < ranges.length; i++) {

            stableRanges[i] = makeUidRangeParcel(ranges[i].start, ranges[i].stop);

        }

        return stableRanges;

    }



    @Override

    @Override

    public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges)

    public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges)

            throws ServiceSpecificException {

            throws ServiceSpecificException {

        mContext.enforceCallingOrSelfPermission(NETWORK_STACK, TAG);

        mContext.enforceCallingOrSelfPermission(NETWORK_STACK, TAG);

        try {

        try {

            mNetdService.networkRejectNonSecureVpn(add, uidRanges);

            mNetdService.networkRejectNonSecureVpn(add, toStableParcels(uidRanges));

        } catch (ServiceSpecificException e) {

        } catch (ServiceSpecificException e) {

            Log.w(TAG, "setAllowOnlyVpnForUids(" + add + ", " + Arrays.toString(uidRanges) + ")"

            Log.w(TAG, "setAllowOnlyVpnForUids(" + add + ", " + Arrays.toString(uidRanges) + ")"

                    + ": netd command failed", e);

                    + ": netd command failed", e);
@@ -1892,7 +1949,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);





        try {

        try {

            mNetdService.networkAddUidRanges(netId, ranges);

            mNetdService.networkAddUidRanges(netId, toStableParcels(ranges));

        } catch (RemoteException | ServiceSpecificException e) {

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

            throw new IllegalStateException(e);

        }

        }
@@ -1902,7 +1959,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    public void removeVpnUidRanges(int netId, UidRange[] ranges) {

    public void removeVpnUidRanges(int netId, UidRange[] ranges) {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

        try {

        try {

            mNetdService.networkRemoveUidRanges(netId, ranges);

            mNetdService.networkRemoveUidRanges(netId, toStableParcels(ranges));

        } catch (RemoteException | ServiceSpecificException e) {

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

            throw new IllegalStateException(e);

        }

        }
@@ -1940,7 +1997,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 




    private void closeSocketsForFirewallChainLocked(int chain, String chainName) {

    private void closeSocketsForFirewallChainLocked(int chain, String chainName) {

        // UID ranges to close sockets on.

        // UID ranges to close sockets on.

        UidRange[] ranges;

        UidRangeParcel[] ranges;

        // UID ranges whose sockets we won't touch.

        // UID ranges whose sockets we won't touch.

        int[] exemptUids;

        int[] exemptUids;
@@ -1948,10 +2005,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        if (DBG) Slog.d(TAG, "Closing sockets after enabling chain " + chainName);

        if (DBG) Slog.d(TAG, "Closing sockets after enabling chain " + chainName);

        if (getFirewallType(chain) == FIREWALL_WHITELIST) {

        if (getFirewallType(chain) == FIREWALL_WHITELIST) {

            // Close all sockets on all non-system UIDs...

            // Close all sockets on all non-system UIDs...

            ranges = new UidRange[] {

            ranges = new UidRangeParcel[] {

                // TODO: is there a better way of finding all existing users? If so, we could

                // TODO: is there a better way of finding all existing users? If so, we could

                // specify their ranges here.

                // specify their ranges here.

                new UidRange(Process.FIRST_APPLICATION_UID, Integer.MAX_VALUE),

                makeUidRangeParcel(Process.FIRST_APPLICATION_UID, Integer.MAX_VALUE),

            };

            };

            // ... except for the UIDs that have allow rules.

            // ... except for the UIDs that have allow rules.

            synchronized (mRulesLock) {

            synchronized (mRulesLock) {
@@ -1978,11 +2035,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
            // Close sockets for every UID that has a deny rule...

            // Close sockets for every UID that has a deny rule...

            synchronized (mRulesLock) {

            synchronized (mRulesLock) {

                final SparseIntArray rules = getUidFirewallRulesLR(chain);

                final SparseIntArray rules = getUidFirewallRulesLR(chain);

                ranges = new UidRange[rules.size()];

                ranges = new UidRangeParcel[rules.size()];

                for (int i = 0; i < ranges.length; i++) {

                for (int i = 0; i < ranges.length; i++) {

                    if (rules.valueAt(i) == FIREWALL_RULE_DENY) {

                    if (rules.valueAt(i) == FIREWALL_RULE_DENY) {

                        int uid = rules.keyAt(i);

                        int uid = rules.keyAt(i);

                        ranges[numUids] = new UidRange(uid, uid);

                        ranges[numUids] = makeUidRangeParcel(uid, uid);

                        numUids++;

                        numUids++;

                    }

                    }

                }

                }