Merge "[Mainline] Migrate TextUtils#emptyIfNull"
This commit is contained in:
@@ -686,7 +686,7 @@ public class NetworkDiagnostics {
|
|||||||
|
|
||||||
mHostname = hostname;
|
mHostname = hostname;
|
||||||
mMeasurement.description = "DNS TLS dst{" + mTarget.getHostAddress() + "} hostname{"
|
mMeasurement.description = "DNS TLS dst{" + mTarget.getHostAddress() + "} hostname{"
|
||||||
+ TextUtils.emptyIfNull(mHostname) + "}";
|
+ (mHostname == null ? "" : mHostname) + "}";
|
||||||
}
|
}
|
||||||
|
|
||||||
private SSLSocket setupSSLSocket() throws IOException {
|
private SSLSocket setupSSLSocket() throws IOException {
|
||||||
|
|||||||
Reference in New Issue
Block a user