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

Commit b51adbd6 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Rename ResolverExperimentalOptions to ResolverOptions am: 05420811 am: 89d15a6a 

Change-Id: Ib2af9602687703c75d9b04c01ba81ca3c455b5a9
parents d6ed17ec 89d15a6a

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ aidl_interface { 
    srcs: [

        "binder/android/net/IDnsResolver.aidl",

        "binder/android/net/ResolverHostsParcel.aidl",

        "binder/android/net/ResolverExperimentalOptionsParcel.aidl",

        "binder/android/net/ResolverOptionsParcel.aidl",

        "binder/android/net/ResolverParamsParcel.aidl",

    ],

    imports: [

ResolverController.cpp

+3 −3
Original line number Diff line number Diff line
@@ -231,9 +231,9 @@ int ResolverController::setResolverConfiguration(const ResolverParamsParcel& res 
    res_params.base_timeout_msec = resolverParams.baseTimeoutMsec;

    res_params.retry_count = resolverParams.retryCount;



    return resolv_set_nameservers(

            resolverParams.netId, resolverParams.servers, resolverParams.domains, res_params,

            resolverParams.experimentalOptions, resolverParams.transportTypes);

    return resolv_set_nameservers(resolverParams.netId, resolverParams.servers,

                                  resolverParams.domains, res_params,

                                  resolverParams.resolverOptions, resolverParams.transportTypes);

}



int ResolverController::getResolverInfo(int32_t netId, std::vector<std::string>* servers,

aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverExperimentalOptionsParcel.aidl→aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverOptionsParcel.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


package android.net;

/* @hide */

parcelable ResolverExperimentalOptionsParcel {

parcelable ResolverOptionsParcel {

  android.net.ResolverHostsParcel[] hosts = {};

  int tcMode = 0;

}

aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverParamsParcel.aidl

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ parcelable ResolverParamsParcel { 
  @utf8InCpp String[] tlsFingerprints = {};

  @utf8InCpp String caCertificate = "";

  int tlsConnectTimeoutMs = 0;

  android.net.ResolverExperimentalOptionsParcel experimentalOptions;

  android.net.ResolverOptionsParcel resolverOptions;

  int[] transportTypes = {};

}

binder/android/net/IDnsResolver.aidl

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ interface IDnsResolver { 
    void flushNetworkCache(int netId);



    /**

     * Values for {@code tcMode} of {@code ResolverExperimentalOptionsParcel}. It controls the way DNS

     * Values for {@code tcMode} of {@code ResolverOptionsParcel}. It controls the way DNS

     * resolver handles truncated DNS response from UDP connection.

     *

     * TC_MODE_DEFAULT: resolver retries on TCP-only on each name server.