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

Commit 134dc5d9 authored by Mike Yu's avatar Mike Yu Committed by Gerrit Code Review
Browse files

Merge changes from topic "idnsresolver_v10" 

* changes:
  Fix flaky test PrivateDnsDohTest.PreferIpv6
  Report private DNS protocols in onPrivateDnsValidationEvent
  Freeze DnsResolver AIDL interfaces to v10
  Extend onPrivateDnsValidationEvent to support the type of private DNS
parents 67936ef2 78f48c31

Android.bp

+8 −7
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ cc_library_headers { 
    ],

}



dnsresolver_aidl_interface_lateststable_version = "V9"

dnsresolver_aidl_interface_lateststable_version = "V10"



cc_library_static {

    name: "dnsresolver_aidl_interface-lateststable-ndk",
@@ -104,6 +104,7 @@ aidl_interface { 
        "7",

        "8",

        "9",

        "10",

    ],

    dumpapi: {

        no_license: true,
@@ -348,7 +349,7 @@ rust_ffi_static { 


    apex_available: [

        "//apex_available:platform", // Needed by doh_ffi_test

        "com.android.resolv"

        "com.android.resolv",

    ],

    min_sdk_version: "29",

}
@@ -403,7 +404,7 @@ rust_ffi_static { 
    whole_static_libs: ["libunwind"],

    apex_available: [

        "//apex_available:platform", // Needed by doh_ffi_test

        "com.android.resolv"

        "com.android.resolv",

    ],

    min_sdk_version: "29",

}

PrivateDnsConfiguration.cpp

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,9 @@ void PrivateDnsConfiguration::sendPrivateDnsValidationEvent(const ServerIdentity 
            .hostname = identity.provider,

            .validation = success ? IDnsResolverUnsolicitedEventListener::VALIDATION_RESULT_SUCCESS

                                  : IDnsResolverUnsolicitedEventListener::VALIDATION_RESULT_FAILURE,

            .protocol = (identity.sockaddr.port() == 853)

                                ? IDnsResolverUnsolicitedEventListener::PROTOCOL_DOT

                                : IDnsResolverUnsolicitedEventListener::PROTOCOL_DOH,

    };

    for (const auto& it : unsolEventListeners) {

        it->onPrivateDnsValidationEvent(validationEvent);

aidl_api/dnsresolver_aidl_interface/10/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
7651ded692085e31b57beae196fc3394eb74a559

aidl_api/dnsresolver_aidl_interface/10/android/net/IDnsResolver.aidl

0 → 100644
+68 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.net;

/* @hide */

interface IDnsResolver {

  boolean isAlive();

  void registerEventListener(android.net.metrics.INetdEventListener listener);

  void setResolverConfiguration(in android.net.ResolverParamsParcel resolverParams);

  void getResolverInfo(int netId, out @utf8InCpp String[] servers, out @utf8InCpp String[] domains, out @utf8InCpp String[] tlsServers, out int[] params, out int[] stats, out int[] wait_for_pending_req_timeout_count);

  void startPrefix64Discovery(int netId);

  void stopPrefix64Discovery(int netId);

  @utf8InCpp String getPrefix64(int netId);

  void createNetworkCache(int netId);

  void destroyNetworkCache(int netId);

  void setLogSeverity(int logSeverity);

  void flushNetworkCache(int netId);

  void setPrefix64(int netId, @utf8InCpp String prefix);

  void registerUnsolicitedEventListener(android.net.resolv.aidl.IDnsResolverUnsolicitedEventListener listener);

  void setResolverOptions(int netId, in android.net.ResolverOptionsParcel optionParams);

  const int RESOLVER_PARAMS_SAMPLE_VALIDITY = 0;

  const int RESOLVER_PARAMS_SUCCESS_THRESHOLD = 1;

  const int RESOLVER_PARAMS_MIN_SAMPLES = 2;

  const int RESOLVER_PARAMS_MAX_SAMPLES = 3;

  const int RESOLVER_PARAMS_BASE_TIMEOUT_MSEC = 4;

  const int RESOLVER_PARAMS_RETRY_COUNT = 5;

  const int RESOLVER_PARAMS_COUNT = 6;

  const int RESOLVER_STATS_SUCCESSES = 0;

  const int RESOLVER_STATS_ERRORS = 1;

  const int RESOLVER_STATS_TIMEOUTS = 2;

  const int RESOLVER_STATS_INTERNAL_ERRORS = 3;

  const int RESOLVER_STATS_RTT_AVG = 4;

  const int RESOLVER_STATS_LAST_SAMPLE_TIME = 5;

  const int RESOLVER_STATS_USABLE = 6;

  const int RESOLVER_STATS_COUNT = 7;

  const int DNS_RESOLVER_LOG_VERBOSE = 0;

  const int DNS_RESOLVER_LOG_DEBUG = 1;

  const int DNS_RESOLVER_LOG_INFO = 2;

  const int DNS_RESOLVER_LOG_WARNING = 3;

  const int DNS_RESOLVER_LOG_ERROR = 4;

  const int TC_MODE_DEFAULT = 0;

  const int TC_MODE_UDP_TCP = 1;

  const int TRANSPORT_UNKNOWN = -1;

  const int TRANSPORT_CELLULAR = 0;

  const int TRANSPORT_WIFI = 1;

  const int TRANSPORT_BLUETOOTH = 2;

  const int TRANSPORT_ETHERNET = 3;

  const int TRANSPORT_VPN = 4;

  const int TRANSPORT_WIFI_AWARE = 5;

  const int TRANSPORT_LOWPAN = 6;

  const int TRANSPORT_TEST = 7;

  const int TRANSPORT_USB = 8;

}

aidl_api/dnsresolver_aidl_interface/10/android/net/ResolverHostsParcel.aidl

0 → 100644
+24 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.net;

/* @hide */

parcelable ResolverHostsParcel {

  @utf8InCpp String ipAddr;

  @utf8InCpp String hostName = "";

}