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

Commit 7c7ca858 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Remove the hidden ConnectivityManager dependency in NMS 

NetworkManagementService that is outside the incoming
connectivity module should stop using hidden NETID_UNSET
in ConnectivityManager. The only usage in NMS is
setDnsForwarders() method which is previously used by CS.
The reference is now replaced by calling INetd directly.
The method could be removed now, so remove it to resolve
the dependency.

Bug: 172183305
Test: m ; atest FrameworksNetTests
Change-Id: I63137b240c4938b082c460bb1a25b447e7f29e80
parent 6faddabe

core/java/android/os/INetworkManagementService.aidl

+0 −5
Original line number Diff line number Diff line
@@ -181,11 +181,6 @@ interface INetworkManagementService 
    @UnsupportedAppUsage

    String[] listTetheredInterfaces();



    /**

     * Sets the list of DNS forwarders (in order of priority)

     */

    void setDnsForwarders(in Network network, in String[] dns);



    /**

     * Returns the list of DNS forwarders (in order of priority)

     */

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

+0 −15
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import static com.android.server.NetworkManagementSocketTagger.PROP_QTAGUID_ENAB 
import android.annotation.NonNull;

import android.app.ActivityManager;

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.INetd;

import android.net.INetdUnsolicitedEventListener;

import android.net.INetworkManagementEventObserver;
@@ -54,7 +53,6 @@ import android.net.InterfaceConfiguration; 
import android.net.InterfaceConfigurationParcel;

import android.net.IpPrefix;

import android.net.LinkAddress;

import android.net.Network;

import android.net.NetworkPolicyManager;

import android.net.NetworkStack;

import android.net.NetworkStats;
@@ -973,19 +971,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
        }

    }



    @Override

    public void setDnsForwarders(Network network, String[] dns) {

        NetworkStack.checkNetworkStackPermission(mContext);



        int netId = (network != null) ? network.netId : ConnectivityManager.NETID_UNSET;



        try {

            mNetdService.tetherDnsSet(netId, dns);

        } catch (RemoteException | ServiceSpecificException e) {

            throw new IllegalStateException(e);

        }

    }



    @Override

    public String[] getDnsForwarders() {

        NetworkStack.checkNetworkStackPermission(mContext);