summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dongwon Kang <dwkang@google.com> 2019-03-01 09:56:56 -0800
committer android-build-merger <android-build-merger@google.com> 2019-03-01 09:56:56 -0800
commit4d0fb6f5dc06dabf3f99ebb59c6a376a7ee9b795 (patch)
tree3665beeadad62b3f51660aa31a296795ac6c1118
parent436a76d1fa3b5dccdd708f5a3938c35251551940 (diff)
parent524cbefb5c73bfe4ff9b91f557db6f21ae2d1b0f (diff)
Merge "Make Uri.toSafeString() also handle 'rtsp'" am: 948d11ffa6 am: a4fadcc192
am: 524cbefb5c Change-Id: I1c3b644fe63b34b41a452a72cb1ed03ff1e5fa71
-rw-r--r--core/java/android/net/Uri.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
index 84368e144320..fdf5321ec8de 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -402,7 +402,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
}
return builder.toString();
} else if (scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https")
- || scheme.equalsIgnoreCase("ftp")) {
+ || scheme.equalsIgnoreCase("ftp") || scheme.equalsIgnoreCase("rtsp")) {
ssp = "//" + ((getHost() != null) ? getHost() : "")
+ ((getPort() != -1) ? (":" + getPort()) : "")
+ "/...";