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

Commit 4d0fb6f5 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

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

am: 524cbefb

Change-Id: I1c3b644fe63b34b41a452a72cb1ed03ff1e5fa71
parents 436a76d1 524cbefb

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()) : "")

                        + "/...";