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

Commit b4d5816c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Add init value for tlsFingerprints and caCertificate am: b9da5e9a am: 9f196fe3 am: 1e527019 

Change-Id: Ib4b5ef57a29460dba92e958c91a72081f10a8049
parents 658d386e 1e527019

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

+1 −1
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ parcelable ResolverParamsParcel { 
  @utf8InCpp String[] domains;

  @utf8InCpp String tlsName;

  @utf8InCpp String[] tlsServers;

  @utf8InCpp String[] tlsFingerprints;

  @utf8InCpp String[] tlsFingerprints = {};

}

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

+1 −1
Original line number Diff line number Diff line
@@ -28,5 +28,5 @@ parcelable ResolverParamsParcel { 
  @utf8InCpp String[] domains;

  @utf8InCpp String tlsName;

  @utf8InCpp String[] tlsServers;

  @utf8InCpp String[] tlsFingerprints;

  @utf8InCpp String[] tlsFingerprints = {};

}

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

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ parcelable ResolverParamsParcel { 
  @utf8InCpp String[] domains;

  @utf8InCpp String tlsName;

  @utf8InCpp String[] tlsServers;

  @utf8InCpp String[] tlsFingerprints;

  @utf8InCpp String caCertificate;

  @utf8InCpp String[] tlsFingerprints = {};

  @utf8InCpp String caCertificate = "";

  int tlsConnectTimeoutMs = 0;

}

binder/android/net/ResolverParamsParcel.aidl

+3 −3
Original line number Diff line number Diff line
@@ -81,14 +81,14 @@ parcelable ResolverParamsParcel { 
     * An array containing TLS public key fingerprints (pins) of which each server must match

     * at least one, or empty if there are no pinned keys.

     */

    // DEPRECATED: no longer to use it

    @utf8InCpp String[] tlsFingerprints;

    // DEPRECATED:Superseded by caCertificate below.

    @utf8InCpp String[] tlsFingerprints = {};



    /**

     * Certificate authority that signed the certificate; only used by DNS-over-TLS tests.

     *

     */

    @utf8InCpp String caCertificate;

    @utf8InCpp String caCertificate = "";



    /**

     * The timeout for the connection attempt to a Private DNS server.