commit e486951a92f2e94ef4cbdac52297791b080ddbff
author David Su <dysu@google.com> Thu Jan 30 22:42:16 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 22:42:16 2020 +0000
tree 06e3b61f9dd54f7cde6c9a240d103559a9f68ac3
parent 5312d0be3efddc934cdc9d09df5f2fb90af5187a
parent 7ae4c7b600e323d79047b9ade8dcf14f6ffcc068

Merge changes Iaa6f0d65,I68a16b64

* changes:
  Networking: Rename removeDoubleQuotes to sanitizeSsid
  Wifi: Rename removeDoubleQuotes to sanitizeSsid

core/java/android/net/NetworkTemplate.java

diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java
index 5e6c47a..5498f74 100644
--- a/core/java/android/net/NetworkTemplate.java
+++ b/core/java/android/net/NetworkTemplate.java
@@ -32,7 +32,7 @@
 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 @@
         switch (ident.mType) {
             case TYPE_WIFI:
                 return Objects.equals(
-                        removeDoubleQuotes(mNetworkId), removeDoubleQuotes(ident.mNetworkId));
+                        sanitizeSsid(mNetworkId), sanitizeSsid(ident.mNetworkId));
             default:
                 return false;
         }