summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorChiachang Wang <chiachangwang@google.com>2021-03-02 19:55:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-02 19:55:22 +0000
commit9ec3eb78028df1ea67cdec0c04106178a29346f3 (patch)
tree5d746d8a6a5684db175450d8b8d5eca9d7e5177f /core/java
parentc966de4129ca8a589486fe0d692ba4a180d60013 (diff)
parent089104cf50944ec433aaa1e11e742d88c9a1efab (diff)
Merge changes Ifc561b6d,I63137b24 am: 0d7553b30e am: fed4ec6ff6 am: 089104cf50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605334 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I695ba5ac549800fbf87a8c2a53e1eab86e91d2c3
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/INetworkManagementService.aidl7
1 files changed, 0 insertions, 7 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl
index 874add5cdbd8..f2d67411ef3a 100644
--- a/core/java/android/os/INetworkManagementService.aidl
+++ b/core/java/android/os/INetworkManagementService.aidl
@@ -182,11 +182,6 @@ interface INetworkManagementService
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)
*/
String[] getDnsForwarders();
@@ -300,8 +295,6 @@ interface INetworkManagementService
void setFirewallUidRules(int chain, in int[] uids, in int[] rules);
void setFirewallChainEnabled(int chain, boolean enable);
- void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid);
-
/**
* Allow UID to call protect().
*/