| commit | e23650d908018a881d3cf0710cff827ab5ac357b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 28 06:05:08 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jan 28 06:05:08 2021 +0000 |
| tree | 71bdbe0f649dced02fa32a829c06cae8116d565d | |
| parent | ea7962335175529e729b2dbb7d10fc09abd66e85 [diff] | |
| parent | ae19ced210474d91a18c2d980604fa9c92f1c1ee [diff] |
Merge "[Mainline] Migrate TextUtils#emptyIfNull"
diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java index a7be657..5e6b9f3 100644 --- a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java +++ b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
@@ -686,7 +686,7 @@ mHostname = hostname; mMeasurement.description = "DNS TLS dst{" + mTarget.getHostAddress() + "} hostname{" - + TextUtils.emptyIfNull(mHostname) + "}"; + + (mHostname == null ? "" : mHostname) + "}"; } private SSLSocket setupSSLSocket() throws IOException {