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

Merge "Make Uri.toSafeString() also handle 'rtsp'"

Browse Source 
am: 948d11ffa6

Change-Id: I3f77108d5b739ed5039e95576db44d94f20ad53e
This commit is contained in:
Dongwon Kang
2019-03-01 09:28:43 -08:00
committed by android-build-merger
parent 2e07ca0f15 948d11ffa6
commit a4fadcc192
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/Uri.java
View File

@@ -402,7 +402,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
} }
return builder.toString(); return builder.toString();
} else if (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https") } else if (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")
|| scheme.equalsIgnoreCase("ftp")) { || scheme.equalsIgnoreCase("ftp") || scheme.equalsIgnoreCase("rtsp")) {
ssp = "//" + ((getHost() != null) ? getHost() : "") ssp = "//" + ((getHost() != null) ? getHost() : "")
+ ((getPort() != -1) ? (":" + getPort()) : "") + ((getPort() != -1) ? (":" + getPort()) : "")
+ "/..."; + "/...";