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

Commit ba104e77 authored by Ivan Chiang's avatar Ivan Chiang Committed by android-build-merger
Browse files

Merge "Expose Uri toSafeString api" am: 17f9b9bf 

am: 1be68938

Change-Id: I9f5de6c9685ee3b9cb75369a8465c154bdbc39f5
parents c92749ad 1be68938

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -27781,6 +27781,7 @@ package android.net { 
    method public abstract boolean isRelative();

    method public android.net.Uri normalizeScheme();

    method public static android.net.Uri parse(java.lang.String);

    method public java.lang.String toSafeString();

    method public abstract java.lang.String toString();

    method public static android.net.Uri withAppendedPath(android.net.Uri, java.lang.String);

    method public static void writeToParcel(android.os.Parcel, android.net.Uri);

core/java/android/net/Uri.java

+5 −4
Original line number Diff line number Diff line
@@ -374,11 +374,12 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
    public abstract String toString();



    /**

     * Return a string representation of the URI that is safe to print

     * to logs and other places where PII should be avoided.

     * @hide

     * Return a string representation of this URI that has common forms of PII redacted,

     * making it safer to use for logging purposes.  For example, {@code tel:800-466-4411} is

     * returned as {@code tel:xxx-xxx-xxxx} and {@code http://example.com/path/to/item/} is

     * returned as {@code http://example.com/...}.

     * @return the common forms PII redacted string of this URI

     */

    @UnsupportedAppUsage

    public String toSafeString() {

        String scheme = getScheme();

        String ssp = getSchemeSpecificPart();