summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 2019-03-01 17:58:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-03-01 17:58:01 +0000
commit39c15b8c5b3505cf327ba7c959d349b0af05a9fc (patch)
tree2b087f80157d351ae97f8898e29c90a2f587c36e
parent1d55fb2fd4b3c01fdbe2f9053696cc7327a7e2d4 (diff)
parent4d0fb6f5dc06dabf3f99ebb59c6a376a7ee9b795 (diff)
Merge "Merge "Make Uri.toSafeString() also handle 'rtsp'" am: 948d11ffa6 am: a4fadcc192 am: 524cbefb5c"
-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()) : "")
+ "/...";