Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Mainline] Migrate TextUtils#emptyIfNull" am: 23438d66dd am: 562a34498f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie90c6d0245703243f66a9bc2e4d0bf512b3e6339
This commit is contained in:
Treehugger Robot
2021-01-28 07:31:49 +00:00
committed by Automerger Merge Worker
parent 59b4925437 562a34498f
commit 8da61cc1f4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
View File

@@ -686,7 +686,7 @@ public class NetworkDiagnostics {
mHostname = hostname; mHostname = hostname;
mMeasurement.description = "DNS TLS dst{" + mTarget.getHostAddress() + "} hostname{" mMeasurement.description = "DNS TLS dst{" + mTarget.getHostAddress() + "} hostname{"
+ TextUtils.emptyIfNull(mHostname) + "}"; + (mHostname == null ? "" : mHostname) + "}";
} }
private SSLSocket setupSSLSocket() throws IOException { private SSLSocket setupSSLSocket() throws IOException {