Snap for 6172028 from b2e935ae7b0825781b2021da019a476183c49897 to rvc-release

Change-Id: Id59887dbc35734b9c1d5a6dcf2974117c4437d6a
This commit is contained in:
android-build-team Robot
2020-01-31 04:11:28 +00:00

View File

@@ -32,7 +32,7 @@ import static android.net.NetworkStats.METERED_YES;
import static android.net.NetworkStats.ROAMING_ALL; import static android.net.NetworkStats.ROAMING_ALL;
import static android.net.NetworkStats.ROAMING_NO; import static android.net.NetworkStats.ROAMING_NO;
import static android.net.NetworkStats.ROAMING_YES; 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.compat.annotation.UnsupportedAppUsage;
import android.os.Parcel; import android.os.Parcel;
@@ -401,7 +401,7 @@ public class NetworkTemplate implements Parcelable {
switch (ident.mType) { switch (ident.mType) {
case TYPE_WIFI: case TYPE_WIFI:
return Objects.equals( return Objects.equals(
removeDoubleQuotes(mNetworkId), removeDoubleQuotes(ident.mNetworkId)); sanitizeSsid(mNetworkId), sanitizeSsid(ident.mNetworkId));
default: default:
return false; return false;
} }