diff options
| -rwxr-xr-x | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/Uri.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index e9346f625285..4f6418b862c0 100755 --- a/api/current.txt +++ b/api/current.txt @@ -27723,7 +27723,7 @@ package android.net { method public abstract boolean isRelative(); method public android.net.Uri normalizeScheme(); method public static android.net.Uri parse(String); - method public String toSafeString(); + method @NonNull public String toSafeString(); method public abstract String toString(); method public static android.net.Uri withAppendedPath(android.net.Uri, String); method public static void writeToParcel(android.os.Parcel, android.net.Uri); diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java index 28b2707bc02d..9125cfbc7f9c 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java @@ -16,6 +16,7 @@ package android.net; +import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.content.Intent; @@ -380,6 +381,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { * returned as {@code http://example.com/...}. * @return the common forms PII redacted string of this URI */ + @NonNull public String toSafeString() { String scheme = getScheme(); String ssp = getSchemeSpecificPart(); |