Wifi: Rename removeDoubleQuotes to sanitizeSsid am: 51939ea9be

Change-Id: I4dade9d23935623afeb3334ec5cbf84bdeaac632
This commit is contained in:
Automerger Merge Worker
2020-01-31 16:37:42 +00:00
2 changed files with 15 additions and 2 deletions

View File

@@ -5671,6 +5671,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) == '"')) {