Commit 51935533 authored Jan 28, 2021 by Treehugger Robot Committed by Automerger Merge Worker Jan 28, 2021

Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: 23438d66 am: 562a3449...

Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: 23438d66 am: 562a3449 am: 8da61cc1 am: ddf729f9 am: 1d769ff3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4317a97fbd9e79fe69bfc6f1254768575fc50c62

services/core/java/com/android/server/connectivity/NetworkDiagnostics.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -686,7 +686,7 @@ public class NetworkDiagnostics {

		mHostname = hostname;
		mMeasurement.description = "DNS TLS dst{" + mTarget.getHostAddress() + "} hostname{"
		+ TextUtils.emptyIfNull(mHostname) + "}";
		+ (mHostname == null ? "" : mHostname) + "}";
		}

		private SSLSocket setupSSLSocket() throws IOException {