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

Commit 2cc6819e authored by Ben Schwartz's avatar Ben Schwartz Committed by android-build-merger
Browse files

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

am: 12318b5b

Change-Id: I12d721a809646070900f81723a4d10f4635fec15
parents 5105505e 12318b5b
Loading
Loading
Loading
Loading
+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);
        }