commit 2cc6819ebf430c5959c7a6f7636600730d818f91
author Ben Schwartz <bemasc@google.com> Wed Oct 04 13:04:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 04 13:04:43 2017 +0000
tree 5b6e9a941e41ebaa08559196a3798b15f519c5a3
parent 5105505efd35c6b2d934794b550538e4f18cf70d
parent 12318b5b4e63c1ba034d51a7a64abdf8169c13c3

Merge "New function signature for setResolverConfiguration" am: 8052930f4f
am: 12318b5b4e

Change-Id: I12d721a809646070900f81723a4d10f4635fec15

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

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index f0528bc..355e949 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -1980,8 +1980,12 @@
 
         final String[] domainStrs = domains == null ? new String[0] : domains.split(" ");
         final int[] params = { sampleValidity, successThreshold, minSamples, maxSamples };
+        final boolean useTls = false;
+        final String tlsHostname = "";
+        final String[] tlsFingerprints = new String[0];
         try {
-            mNetdService.setResolverConfiguration(netId, servers, domainStrs, params);
+            mNetdService.setResolverConfiguration(netId, servers, domainStrs, params,
+                    useTls, tlsHostname, tlsFingerprints);
         } catch (RemoteException e) {
             throw new RuntimeException(e);
         }