From c1041d3fce6785de8b8505c88cc55b2f5ef6e809 Mon Sep 17 00:00:00 2001
From: Ecco Park <eccopark@google.com>
Date: Fri, 1 Mar 2019 09:59:03 -0800
Subject: [PATCH] api-review: add @Nullable for getFriendlyNames() and
 getServerUri()

Bug: 126701512
Test: unitTest
Change-Id: Ia09bcc4c34e0915b2add89f5851be6e732402ac0
Signed-off-by: Ecco Park <eccopark@google.com>
---
 api/system-current.txt                               | 4 ++--
 wifi/java/android/net/wifi/hotspot2/OsuProvider.java | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index fb30ad7a13205..7ebc4147bc09b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4965,8 +4965,8 @@ package android.net.wifi.hotspot2 {
 
   public final class OsuProvider implements android.os.Parcelable {
     method public int describeContents();
-    method public String getFriendlyName();
-    method public android.net.Uri getServerUri();
+    method @Nullable public String getFriendlyName();
+    method @Nullable public android.net.Uri getServerUri();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.OsuProvider> CREATOR;
   }
diff --git a/wifi/java/android/net/wifi/hotspot2/OsuProvider.java b/wifi/java/android/net/wifi/hotspot2/OsuProvider.java
index a1684d664c2d1..57dff9d761cbf 100644
--- a/wifi/java/android/net/wifi/hotspot2/OsuProvider.java
+++ b/wifi/java/android/net/wifi/hotspot2/OsuProvider.java
@@ -16,6 +16,7 @@
 
 package android.net.wifi.hotspot2;
 
+import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
@@ -156,7 +157,7 @@ public final class OsuProvider implements Parcelable {
      *
      * @return String matching the default locale, null otherwise
      */
-    public String getFriendlyName() {
+    public @Nullable String getFriendlyName() {
         if (mFriendlyNames == null || mFriendlyNames.isEmpty()) return null;
         String lang = Locale.getDefault().getLanguage();
         String friendlyName = mFriendlyNames.get(lang);
@@ -180,7 +181,7 @@ public final class OsuProvider implements Parcelable {
         return mServiceDescription;
     }
 
-    public Uri getServerUri() {
+    public @Nullable Uri getServerUri() {
         return mServerUri;
     }