Merge "Make Uri.toSafeString() also handle 'rtsp'" am: 948d11ffa6 am: a4fadcc192

am: 524cbefb5c Change-Id: I1c3b644fe63b34b41a452a72cb1ed03ff1e5fa71
2019-03-01 09:56:56 -08:00
parent 436a76d1fa 524cbefb5c
commit 4d0fb6f5dc
1 changed files with 1 additions and 1 deletions
--- 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()) : "")
                        + "/...";