| commit | b9da5e9a8c17c3ca2af6c0c941200abbe29be0f5 | [log] [tgz] |
|---|---|---|
| author | waynema <waynema@google.com> | Tue Dec 17 14:35:11 2019 +0800 |
| committer | waynema <waynema@google.com> | Thu Dec 26 12:00:04 2019 +0800 |
| tree | 790afb7e737de664efe0909e2ddfc584d423e629 | |
| parent | 2925305b94674b1fc8f3836ceea3b1cbf27e346e [diff] |
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
diff --git a/aidl_api/dnsresolver_aidl_interface/1/android/net/ResolverParamsParcel.aidl b/aidl_api/dnsresolver_aidl_interface/1/android/net/ResolverParamsParcel.aidl index b808bae..5333f31 100644 --- a/aidl_api/dnsresolver_aidl_interface/1/android/net/ResolverParamsParcel.aidl +++ b/aidl_api/dnsresolver_aidl_interface/1/android/net/ResolverParamsParcel.aidl
@@ -11,5 +11,5 @@ @utf8InCpp String[] domains; @utf8InCpp String tlsName; @utf8InCpp String[] tlsServers; - @utf8InCpp String[] tlsFingerprints; + @utf8InCpp String[] tlsFingerprints = {}; }
diff --git a/aidl_api/dnsresolver_aidl_interface/2/android/net/ResolverParamsParcel.aidl b/aidl_api/dnsresolver_aidl_interface/2/android/net/ResolverParamsParcel.aidl index a37f938..5c81616 100644 --- a/aidl_api/dnsresolver_aidl_interface/2/android/net/ResolverParamsParcel.aidl +++ b/aidl_api/dnsresolver_aidl_interface/2/android/net/ResolverParamsParcel.aidl
@@ -28,5 +28,5 @@ @utf8InCpp String[] domains; @utf8InCpp String tlsName; @utf8InCpp String[] tlsServers; - @utf8InCpp String[] tlsFingerprints; + @utf8InCpp String[] tlsFingerprints = {}; }
diff --git a/aidl_api/dnsresolver_aidl_interface/3/android/net/ResolverParamsParcel.aidl b/aidl_api/dnsresolver_aidl_interface/3/android/net/ResolverParamsParcel.aidl index 8cab69b..ce31f1a 100644 --- a/aidl_api/dnsresolver_aidl_interface/3/android/net/ResolverParamsParcel.aidl +++ b/aidl_api/dnsresolver_aidl_interface/3/android/net/ResolverParamsParcel.aidl
@@ -11,7 +11,7 @@ @utf8InCpp String[] domains; @utf8InCpp String tlsName; @utf8InCpp String[] tlsServers; - @utf8InCpp String[] tlsFingerprints; - @utf8InCpp String caCertificate; + @utf8InCpp String[] tlsFingerprints = {}; + @utf8InCpp String caCertificate = ""; int tlsConnectTimeoutMs = 0; }
diff --git a/binder/android/net/ResolverParamsParcel.aidl b/binder/android/net/ResolverParamsParcel.aidl index 76d9612..3ea7db6 100644 --- a/binder/android/net/ResolverParamsParcel.aidl +++ b/binder/android/net/ResolverParamsParcel.aidl
@@ -81,14 +81,14 @@ * 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.