Commit 9f01fc17 authored by Katharine Daly's avatar Katharine Daly Committed by Commit Bot

Fix DCHECK error with GetDnsServers.

The LinkProperties.GetPrivateDnsServerName API method can return null,
which causes a DCHECK error for Android Pie and above  when we convert
from Java to c++.

Bug: 994459
Change-Id: I5a365df252254bc6f3e8cab4576be8ebce9a589b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1757352
Commit-Queue: Paul Jensen <pauljensen@chromium.org>
Reviewed-by: default avatarPaul Jensen <pauljensen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#687633}
parent 84ebc63a
...@@ -25,7 +25,7 @@ public class DnsStatus { ...@@ -25,7 +25,7 @@ public class DnsStatus {
List<InetAddress> dnsServers, boolean privateDnsActive, String privateDnsServerName) { List<InetAddress> dnsServers, boolean privateDnsActive, String privateDnsServerName) {
mDnsServers = dnsServers; mDnsServers = dnsServers;
mPrivateDnsActive = privateDnsActive; mPrivateDnsActive = privateDnsActive;
mPrivateDnsServerName = privateDnsServerName; mPrivateDnsServerName = (privateDnsServerName != null) ? privateDnsServerName : "";
} }
@CalledByNative @CalledByNative
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment