Merge "[Mainline] Migrate TextUtils#emptyIfNull"

2021-01-28 06:05:08 +00:00 · 2021-01-28 06:05:08 +00:00 · a4520fd260
commit a4520fd260
parent d1a04ba095 9d4ffa1992
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 {