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

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

Browse Source 
am: 12318b5b4e

Change-Id: I12d721a809646070900f81723a4d10f4635fec15
This commit is contained in:
Ben Schwartz
2017-10-04 13:04:43 +00:00
committed by android-build-merger
parent 5105505efd 12318b5b4e
commit 2cc6819ebf
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1980,8 +1980,12 @@ public class NetworkManagementService extends INetworkManagementService.Stub
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);
}