summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-03-24 15:58:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-24 15:58:42 +0000
commitca697c621e448a50e1c0d8a021e37efa7a6a0983 (patch)
tree0d6bcadd714cec017b5e45e2fc51a57cb24c5666 /core/java/android
parent96b341e43a7ee7c283b08ad8568036407fc04ab3 (diff)
parent117e7f3c76a02060b423cc370aadc0325ccebd9d (diff)
Merge "Pass all relevant resolver info to netd" into pi-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/INetworkManagementService.aidl2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl
index a5e1934ad5d6..2437ed1b6d61 100644
--- a/core/java/android/os/INetworkManagementService.aidl
+++ b/core/java/android/os/INetworkManagementService.aidl
@@ -340,7 +340,7 @@ interface INetworkManagementService
* Configure name servers, search paths, and resolver parameters for the given network.
*/
void setDnsConfigurationForNetwork(int netId, in String[] servers, in String[] domains,
- in int[] params, boolean useTls, String tlsHostname);
+ in int[] params, String tlsHostname, in String[] tlsServers);
void setFirewallEnabled(boolean enabled);
boolean isFirewallEnabled();