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

Commit 948d11ff authored by Dongwon Kang's avatar Dongwon Kang Committed by Gerrit Code Review
Browse files

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

parents 3275a6b2 9c0038eb

core/java/android/net/Uri.java

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

                        + "/...";

                        + "/...";