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

Merge "Update nullability of api"

Browse Source 
am: 47890345d0

Change-Id: Ie8ed183155b16c87a98c19f11f69fe869e797880
This commit is contained in:
Tony Huang
2019-03-11 22:29:24 -07:00
committed by android-build-merger
parent 7bb0014975 47890345d0
commit 434096edef
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 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);

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

@@ -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();