Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39c15b8c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Make Uri.toSafeString() also handle 'rtsp'" am: 948d11ff am: a4fadcc1 am: 524cbefb"
parents 1d55fb2f 4d0fb6f5

core/java/android/net/Uri.java

+1 −1
Original line number Diff line number Diff line
@@ -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()) : "")

                        + "/...";