From ae19ced210474d91a18c2d980604fa9c92f1c1ee Mon Sep 17 00:00:00 2001
From: Serik Beketayev <serikb@google.com>
Date: Wed, 13 Jan 2021 17:37:09 -0800
Subject: [PATCH] [Mainline] Migrate TextUtils#emptyIfNull

Bug: 177477620
Test: mma
Change-Id: I0be23ae486e86864d7b3225c68ef2cfe7c7247af
---
 .../com/android/server/connectivity/NetworkDiagnostics.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
index a7be657ae7..5e6b9f39b4 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 @@ public class NetworkDiagnostics {
 
             mHostname = hostname;
             mMeasurement.description = "DNS TLS dst{" + mTarget.getHostAddress() + "} hostname{"
-                    + TextUtils.emptyIfNull(mHostname) + "}";
+                    + (mHostname == null ? "" : mHostname) + "}";
         }
 
         private SSLSocket setupSSLSocket() throws IOException {