diff options
| author | 2021-01-28 06:05:08 +0000 | |
|---|---|---|
| committer | 2021-01-28 06:05:08 +0000 | |
| commit | 23438d66dd5e0b0359715a68c2592865685f8810 (patch) | |
| tree | a54ee274db83be98f545a8a26a019da2569a17a1 | |
| parent | 6c0e8ad6274ed685f3c40261a1b51eb40b38a9de (diff) | |
| parent | 0ded38553b7d39b043389112a943c06a8c175085 (diff) | |
Merge "[Mainline] Migrate TextUtils#emptyIfNull"
| -rw-r--r-- | services/core/java/com/android/server/connectivity/NetworkDiagnostics.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java index a7be657ae7a3..5e6b9f39b40a 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 { |