Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 444b7270 authored by Ben Schwartz's avatar Ben Schwartz Committed by android-build-merger
Browse files

Merge "New function signature for setResolverConfiguration" am: 8052930f am:... 

Merge "New function signature for setResolverConfiguration" am: 8052930f am: 12318b5b am: 2cc6819e
am: 87337e0f

Change-Id: Ibc309ee68b99712f74048cb5d865f7699c58edc0
parents 29e6f569 87337e0f

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

+5 −1
Original line number Diff line number Diff line
@@ -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);

        }