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

Commit 6788bee1 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Make resolverOptions in ResolverParamsParcel nullable and add a new IPC setResolverOption 

This information was only ever supplied by OEM code and DnsManager has never
set it to anything.

The new IPC is used to set resolver options separately.

Bug: 194048056
Test: m dnsresolver_aidl_interface-update-api
Change-Id: I81f4b12dbb06783b72883572926b2e423220a9f7
Merged-In: I81f4b12dbb06783b72883572926b2e423220a9f7
parent 42b82883

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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ interface IDnsResolver { 
  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;

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

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

  @utf8InCpp String caCertificate = "";

  int tlsConnectTimeoutMs = 0;

  android.net.ResolverOptionsParcel resolverOptions;

  @nullable android.net.ResolverOptionsParcel resolverOptions;

  int[] transportTypes = {};

}

binder/android/net/IDnsResolver.aidl

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.net;



import android.net.ResolverOptionsParcel;

import android.net.ResolverParamsParcel;

import android.net.metrics.INetdEventListener;

import android.net.resolv.aidl.IDnsResolverUnsolicitedEventListener;
@@ -233,4 +234,14 @@ interface IDnsResolver { 
    *         unix errno.

    */

    void registerUnsolicitedEventListener(IDnsResolverUnsolicitedEventListener listener);



    /**

     * Sets resolver options for the given network.

     *

     * @param netId the netId on which to set the options.

     * @param optionParams the option parameters to be wrapped into parcel.

     * @throws ServiceSpecificException in case of failure, with an error code corresponding to the

     *         unix errno.

     */

    void setResolverOptions(int netId, in ResolverOptionsParcel optionParams);

}

binder/android/net/ResolverParamsParcel.aidl

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ parcelable ResolverParamsParcel { 
    /**

     * Knobs for OEM to control alternative behavior.

     */

    @nullable

    ResolverOptionsParcel resolverOptions;



    /**