Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddf729f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: 23438d66 am: 562a3449 am: 8da61cc1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14cc8f1f44b09c82ed9d897b904513d3ea49d558
parents 5974b291 8da61cc1

services/core/java/com/android/server/connectivity/NetworkDiagnostics.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {