Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23cce279f53babac5b90364dd4fc0e55eb382dfa
This commit is contained in:
Chiachang Wang
2021-03-02 19:22:34 +00:00
committed by Automerger Merge Worker
parent c4432db9e9 0d7553b30e
commit fed4ec6ff6
2 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/INetworkManagementService.aidl
View File

@@ -181,11 +181,6 @@ interface INetworkManagementService
@UnsupportedAppUsage @UnsupportedAppUsage
String[] listTetheredInterfaces(); 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) * Returns the list of DNS forwarders (in order of priority)
*/ */
@@ -300,8 +295,6 @@ interface INetworkManagementService
void setFirewallUidRules(int chain, in int[] uids, in int[] rules); void setFirewallUidRules(int chain, in int[] uids, in int[] rules);
void setFirewallChainEnabled(int chain, boolean enable); void setFirewallChainEnabled(int chain, boolean enable);
void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid);
/** /**
* Allow UID to call protect(). * Allow UID to call protect().
*/ */

36
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -44,7 +44,6 @@ import static com.android.server.NetworkManagementSocketTagger.PROP_QTAGUID_ENAB
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager;
import android.net.INetd; import android.net.INetd;
import android.net.INetdUnsolicitedEventListener; import android.net.INetdUnsolicitedEventListener;
import android.net.INetworkManagementEventObserver; import android.net.INetworkManagementEventObserver;
@@ -54,7 +53,6 @@ import android.net.InterfaceConfiguration;
import android.net.InterfaceConfigurationParcel; import android.net.InterfaceConfigurationParcel;
import android.net.IpPrefix; import android.net.IpPrefix;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.Network;
import android.net.NetworkPolicyManager; import android.net.NetworkPolicyManager;
import android.net.NetworkStack; import android.net.NetworkStack;
import android.net.NetworkStats; 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 @Override
public String[] getDnsForwarders() { public String[] getDnsForwarders() {
NetworkStack.checkNetworkStackPermission(mContext); NetworkStack.checkNetworkStackPermission(mContext);
@@ -1774,27 +1759,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
} }
} }
@Override
public void addLegacyRouteForNetId(int netId, RouteInfo routeInfo, int uid) {
NetworkStack.checkNetworkStackPermission(mContext);
final LinkAddress la = routeInfo.getDestinationLinkAddress();
final String ifName = routeInfo.getInterface();
final String dst = la.toString();
final String nextHop;
if (routeInfo.hasGateway()) {
nextHop = routeInfo.getGateway().getHostAddress();
} else {
nextHop = "";
}
try {
mNetdService.networkAddLegacyRoute(netId, ifName, dst, nextHop, uid);
} catch (RemoteException | ServiceSpecificException e) {
throw new IllegalStateException(e);
}
}
@Override @Override
public void allowProtect(int uid) { public void allowProtect(int uid) {
NetworkStack.checkNetworkStackPermission(mContext); NetworkStack.checkNetworkStackPermission(mContext);