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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9ae1d067d23fb87d97f326f6da29ddf3a022a821
2021-01-28 07:04:48 +00:00 · 2021-01-28 07:04:48 +00:00 · 59452b2ad4
commit 59452b2ad4
parent a9090b57cf a4520fd260
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 {