Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: a4520fd260 am: 59452b2ad4 am: ac4ababa1b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I14cc8f1f44b09c82ed9d897b904513d3ea49d558
2021-01-28 08:05:36 +00:00
parent 359e963945 ac4ababa1b
commit b7ac698f9d
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
+++ b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
@@ -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 {