joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes Iaa6f0d65,I68a16b64 am: e486951a92

Browse source 
Change-Id: I687e59f2c25d5c5e2cb5b1574dbcf6f32ec8c817
This commit is contained in:
Automerger Merge Worker 2020-01-31 16:37:49 +00:00
commit 8abb5a0520
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/java/android/net/NetworkTemplate.java
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_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;
}