From 51939ea9be1743f3aa402b32d9a54abb42694ab1 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Mon, 27 Jan 2020 13:26:52 -0800
Subject: [PATCH] Wifi: Rename removeDoubleQuotes to sanitizeSsid

Keep removeDoubleQuotes as it is marked
@UnsupportedAppUsage.

Bug: 145745815
Test: compiles
Change-Id: I68a16b64eba3d84265b5cf2c83b434dc4fc7fa3c
Merged-In: I68a16b64eba3d84265b5cf2c83b434dc4fc7fa3c
(dirty cherry-pick from internal branch)
---
 api/system-current.txt                   |  1 +
 wifi/java/android/net/wifi/WifiInfo.java | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 44a1c0d79c134..68fe5b29b9e3a 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5628,6 +5628,7 @@ package android.net.wifi {
   public class WifiInfo implements android.os.Parcelable {
     method public boolean isOsuAp();
     method public boolean isPasspointAp();
+    method @Nullable public static String sanitizeSsid(@Nullable String);
   }
 
   public class WifiManager {
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index 8bad71ba747b2..0204113b614bd 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/wifi/java/android/net/wifi/WifiInfo.java
@@ -658,9 +658,21 @@ public class WifiInfo implements Parcelable {
         }
     }
 
-    /** {@hide} */
+    /**
+     * Remove double quotes (") surrounding a SSID string, if present. Otherwise, return the
+     * string unmodified. Return null if the input string was null.
+     * @hide
+     */
+    @Nullable
+    @SystemApi
+    public static String sanitizeSsid(@Nullable String string) {
+        return removeDoubleQuotes(string);
+    }
+
+    /** @hide */
     @UnsupportedAppUsage
-    public static String removeDoubleQuotes(String string) {
+    @Nullable
+    public static String removeDoubleQuotes(@Nullable String string) {
         if (string == null) return null;
         final int length = string.length();
         if ((length > 1) && (string.charAt(0) == '"') && (string.charAt(length - 1) == '"')) {