From e3f17b76c121f2e6f635228f3b6caeeabaaf7792 Mon Sep 17 00:00:00 2001
From: Tony Huang <tonyychuang@google.com>
Date: Wed, 6 Mar 2019 15:04:37 +0800
Subject: [PATCH] Update nullability of api

Update nullability of toSafeString api in Uri class.

Fix: 126701632
Test: make
Change-Id: I58f60259296fb1f638222887c67b5d85c7997a13
---
 api/current.txt                | 2 +-
 core/java/android/net/Uri.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 513d3a4143efe..e7d5df9555bec 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 28b2707bc02d2..9125cfbc7f9cc 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();