From 4411940b632293fb62913199a09b5977930a9555 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
---
 api/system-current.txt                   | 2 +-
 wifi/java/android/net/wifi/WifiInfo.java | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 0b40553fa6a00..9faa9ddd95eec 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7580,7 +7580,7 @@ package android.net.wifi {
     method public boolean isEphemeral();
     method public boolean isOsuAp();
     method public boolean isPasspointAp();
-    method @Nullable public static String removeDoubleQuotes(@Nullable String);
+    method @Nullable public static String sanitizeSsid(@Nullable String);
     field public static final String DEFAULT_MAC_ADDRESS = "02:00:00:00:00:00";
     field public static final int INVALID_RSSI = -127; // 0xffffff81
   }
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index f8d48c5403f7a..7c031eaaeaf4a 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/wifi/java/android/net/wifi/WifiInfo.java
@@ -889,6 +889,13 @@ public class WifiInfo implements Parcelable {
      */
     @Nullable
     @SystemApi
+    public static String sanitizeSsid(@Nullable String string) {
+        return removeDoubleQuotes(string);
+    }
+
+    /** @hide */
+    @UnsupportedAppUsage
+    @Nullable
     public static String removeDoubleQuotes(@Nullable String string) {
         if (string == null) return null;
         final int length = string.length();