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

Commit b9da5e9a authored by waynema's avatar waynema
Browse files

Add init value for tlsFingerprints and caCertificate

Prevent null pointer exception from changing the version of
dnsresolver_aidl_interface from V2 to unstable.

Bug:146100043
Test:cd packages/modules/DnsResolver/ & atest
Change-Id: Ibdad9b0a3e75474670732b6e5da4305ee9d1da49
parent 2925305b
Loading
Loading
Loading
Loading
+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 = {};
}
+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 = {};
}
+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;
}
+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.