| commit | a4520fd260b61bf6907552b53c8a9d913c2bcb66 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jan 28 06:05:08 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jan 28 06:05:08 2021 +0000 |
| tree | 71bdbe0f649dced02fa32a829c06cae8116d565d | |
| parent | d1a04ba095268ca40f23b7ca69e3ceb61734fed7 [diff] | |
| parent | 9d4ffa1992884c89ca8a1f780e41778dd10c135c [diff] |
Merge "[Mainline] Migrate TextUtils#emptyIfNull"
diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java index a7be657..5e6b9f3 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 @@ mHostname = hostname; mMeasurement.description = "DNS TLS dst{" + mTarget.getHostAddress() + "} hostname{" - + TextUtils.emptyIfNull(mHostname) + "}"; + + (mHostname == null ? "" : mHostname) + "}"; } private SSLSocket setupSSLSocket() throws IOException {