Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: 23438d66dd am: 562a34498f am: 8da61cc1f4 am: ddf729f9ca am: 1d769ff312

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4317a97fbd9e79fe69bfc6f1254768575fc50c62
2021-01-28 08:40:18 +00:00
parent f4fc0ee9ee 1d769ff312
commit 5193553306
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 {