Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update nullability of api"

Browse Source
This commit is contained in:
Tony Huang
2019-03-12 05:22:28 +00:00
committed by Gerrit Code Review
parent cc3a190b07 e3f17b76c1
commit 47890345d0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -27723,7 +27723,7 @@ package android.net {
method public abstract boolean isRelative(); method public abstract boolean isRelative();
method public android.net.Uri normalizeScheme(); method public android.net.Uri normalizeScheme();
method public static android.net.Uri parse(String); method public static android.net.Uri parse(String);
method public String toSafeString(); method @NonNull public String toSafeString();
method public abstract String toString(); method public abstract String toString();
method public static android.net.Uri withAppendedPath(android.net.Uri, String); method public static android.net.Uri withAppendedPath(android.net.Uri, String);
method public static void writeToParcel(android.os.Parcel, android.net.Uri); method public static void writeToParcel(android.os.Parcel, android.net.Uri);

2
core/java/android/net/Uri.java
View File

@@ -16,6 +16,7 @@
package android.net; package android.net;
import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.content.Intent; import android.content.Intent;
@@ -380,6 +381,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
* returned as {@code http://example.com/...}. * returned as {@code http://example.com/...}.
* @return the common forms PII redacted string of this URI * @return the common forms PII redacted string of this URI
*/ */
@NonNull
public String toSafeString() { public String toSafeString() {
String scheme = getScheme(); String scheme = getScheme();
String ssp = getSchemeSpecificPart(); String ssp = getSchemeSpecificPart();