| commit | 9d4ffa1992884c89ca8a1f780e41778dd10c135c | [log] [tgz] |
|---|---|---|
| author | Serik Beketayev <serikb@google.com> | Wed Jan 13 17:37:09 2021 -0800 |
| committer | Serik Beketayev <serikb@google.com> | Wed Jan 13 17:37:09 2021 -0800 |
| tree | da0ff8c0f905d824887f1219d759da7a16607af6 | |
| parent | ca95071a9824cf661284e9ca538ce2906a4e2b28 [diff] |
[Mainline] Migrate TextUtils#emptyIfNull Bug: 177477620 Test: mma Change-Id: I0be23ae486e86864d7b3225c68ef2cfe7c7247af
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 {