Merge changes Iaa6f0d65,I68a16b64
* changes: Networking: Rename removeDoubleQuotes to sanitizeSsid Wifi: Rename removeDoubleQuotes to sanitizeSsid
This commit is contained in:
@@ -32,7 +32,7 @@ import static android.net.NetworkStats.METERED_YES;
|
||||
import static android.net.NetworkStats.ROAMING_ALL;
|
||||
import static android.net.NetworkStats.ROAMING_NO;
|
||||
import static android.net.NetworkStats.ROAMING_YES;
|
||||
import static android.net.wifi.WifiInfo.removeDoubleQuotes;
|
||||
import static android.net.wifi.WifiInfo.sanitizeSsid;
|
||||
|
||||
import android.compat.annotation.UnsupportedAppUsage;
|
||||
import android.os.Parcel;
|
||||
@@ -401,7 +401,7 @@ public class NetworkTemplate implements Parcelable {
|
||||
switch (ident.mType) {
|
||||
case TYPE_WIFI:
|
||||
return Objects.equals(
|
||||
removeDoubleQuotes(mNetworkId), removeDoubleQuotes(ident.mNetworkId));
|
||||
sanitizeSsid(mNetworkId), sanitizeSsid(ident.mNetworkId));
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user