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

Commit f9a8c2e1 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Remove deps from framework on netd interfaces 

If included in framework.jar, the interfaces conflict with any app that
needs to depend on them, including the NetworkStack.

(cherry-pick of aosp/903220 with trivial conflict in Android.bp)

Bug: 124033493
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I0ecae20d514bf888f3a80331f19369ceb1c52aa3
parent d8b390c8

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ java_defaults { 
        "android.hardware.vibrator-V1.3-java",

        "android.hardware.wifi-V1.0-java-constants",

        "networkstack-aidl-interfaces-java",

        "netd_aidl_interface-java",

        "netd_aidl_parcelables-java",

        "devicepolicyprotosnano",

    ],

config/hiddenapi-greylist.txt

+0 −2
Original line number Diff line number Diff line
@@ -542,8 +542,6 @@ Landroid/net/IConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String; 
Landroid/net/IConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;

Landroid/net/IConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;

Landroid/net/IConnectivityManager;->startLegacyVpn(Lcom/android/internal/net/VpnProfile;)V

Landroid/net/INetd$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetd;

Landroid/net/INetd;->interfaceAddAddress(Ljava/lang/String;Ljava/lang/String;I)V

Landroid/net/INetworkManagementEventObserver$Stub;-><init>()V

Landroid/net/INetworkPolicyListener$Stub;-><init>()V

Landroid/net/INetworkPolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkPolicyManager;

core/java/android/app/SystemServiceRegistry.java

+3 −5
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ import android.net.IConnectivityManager; 
import android.net.IEthernetManager;

import android.net.IIpMemoryStore;

import android.net.IIpSecService;

import android.net.INetd;

import android.net.INetworkPolicyManager;

import android.net.IpMemoryStore;

import android.net.IpSecManager;
@@ -330,11 +329,10 @@ final class SystemServiceRegistry { 
                return new ConnectivityManager(context, service);

            }});



        registerService(Context.NETD_SERVICE, INetd.class, new StaticServiceFetcher<INetd>() {

        registerService(Context.NETD_SERVICE, IBinder.class, new StaticServiceFetcher<IBinder>() {

            @Override

            public INetd createService() throws ServiceNotFoundException {

                return INetd.Stub.asInterface(

                        ServiceManager.getServiceOrThrow(Context.NETD_SERVICE));

            public IBinder createService() throws ServiceNotFoundException {

                return ServiceManager.getServiceOrThrow(Context.NETD_SERVICE);

            }

        });

core/java/android/net/InterfaceConfiguration.java

+3 −2
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ public class InterfaceConfiguration implements Parcelable { 
    private LinkAddress mAddr;

    private HashSet<String> mFlags = Sets.newHashSet();



    private static final String FLAG_UP = INetd.IF_STATE_UP;

    private static final String FLAG_DOWN = INetd.IF_STATE_DOWN;

    // Must be kept in sync with constant in INetd.aidl

    private static final String FLAG_UP = "up";

    private static final String FLAG_DOWN = "down";



    private static final  String[] EMPTY_STRING_ARRAY = new String[0];

core/java/android/net/NetworkPolicyManager.java

+0 −10
Original line number Diff line number Diff line
@@ -92,16 +92,6 @@ public class NetworkPolicyManager { 
    public static final int MASK_ALL_NETWORKS     = 0b11110000;



    public static final int FIREWALL_RULE_DEFAULT = 0;

    public static final int FIREWALL_RULE_ALLOW = INetd.FIREWALL_RULE_ALLOW;

    public static final int FIREWALL_RULE_DENY = INetd.FIREWALL_RULE_DENY;



    public static final int FIREWALL_TYPE_WHITELIST = INetd.FIREWALL_WHITELIST;

    public static final int FIREWALL_TYPE_BLACKLIST = INetd.FIREWALL_BLACKLIST;



    public static final int FIREWALL_CHAIN_NONE = INetd.FIREWALL_CHAIN_NONE;

    public static final int FIREWALL_CHAIN_DOZABLE = INetd.FIREWALL_CHAIN_DOZABLE;

    public static final int FIREWALL_CHAIN_STANDBY = INetd.FIREWALL_CHAIN_STANDBY;

    public static final int FIREWALL_CHAIN_POWERSAVE = INetd.FIREWALL_CHAIN_POWERSAVE;



    public static final String FIREWALL_CHAIN_NAME_NONE = "none";

    public static final String FIREWALL_CHAIN_NAME_DOZABLE = "dozable";