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

Commit 434096ed authored by Tony Huang's avatar Tony Huang Committed by android-build-merger
Browse files

Merge "Update nullability of api" 

am: 47890345

Change-Id: Ie8ed183155b16c87a98c19f11f69fe869e797880
parents 7bb00149 47890345

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/net/Uri.java

+2 −0
Original line number Diff line number Diff line
@@ -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();