LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove NetdService, NetworkStackClient dependency

Browse Source 
Netd should be obtained via getSystemService, and
ModuleNetworkStackClient must be used instead of NetworkStackClient for
modules.

Original change (project moved):
Ibe703ac56dd70673115cd8b95b44b856a7fc01f3

Bug: 171540887
Test: m
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I6c8593712c0e86da139d425ef6240c5004e392e2
This commit is contained in:
Remi NGUYEN VAN
2021-03-06 00:26:43 +09:00
parent 06830749cc
commit 8ae54f7a3e
5 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
service/src/com/android/server/ConnectivityService.java
View File

@@ -149,7 +149,6 @@ import android.net.NetworkRequest;
import android.net.NetworkScore;
import android.net.NetworkSpecifier;
import android.net.NetworkStack;
import android.net.NetworkStackClient;
import android.net.NetworkState;
import android.net.NetworkStateSnapshot;
import android.net.NetworkTestResultParcelable;
@@ -176,13 +175,14 @@ import android.net.VpnTransportInfo;
import android.net.metrics.IpConnectivityLog;
import android.net.metrics.NetworkEvent;
import android.net.netlink.InetDiagMessage;
import android.net.networkstack.ModuleNetworkStackClient;
import android.net.networkstack.NetworkStackClientBase;
import android.net.resolv.aidl.DnsHealthEventParcel;
import android.net.resolv.aidl.IDnsResolverUnsolicitedEventListener;
import android.net.resolv.aidl.Nat64PrefixEventParcel;
import android.net.resolv.aidl.PrivateDnsValidationEventParcel;
import android.net.shared.PrivateDnsConfig;
import android.net.util.MultinetworkPolicyTracker;
import android.net.util.NetdService;
import android.os.BatteryStatsManager;
import android.os.Binder;
import android.os.Build;
@@ -1183,10 +1183,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
/**
* Get a reference to the NetworkStackClient.
* Get a reference to the ModuleNetworkStackClient.
*/
public NetworkStackClient getNetworkStack() {
return NetworkStackClient.getInstance();
public NetworkStackClientBase getNetworkStack() {
return ModuleNetworkStackClient.getInstance(null);
}
/**
@@ -1245,7 +1245,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
public ConnectivityService(Context context) {
this(context, getDnsResolver(context), new IpConnectivityLog(),
NetdService.getInstance(), new Dependencies());
INetd.Stub.asInterface((IBinder) context.getSystemService(Context.NETD_SERVICE)),
new Dependencies());
}
@VisibleForTesting
@@ -2988,10 +2989,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
pw.println();
pw.println("NetworkStackClient logs:");
pw.increaseIndent();
NetworkStackClient.getInstance().dump(pw);
pw.decreaseIndent();
pw.println();
pw.println("Permission Monitor:");