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)
This commit is contained in:
David Su
2020-01-27 13:26:52 -08:00
parent bd9ff62138
commit 51939ea9be
2 changed files with 15 additions and 2 deletions

View File

@@ -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 {

View File

@@ -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) == '"')) {