commit 2e4dce0dd24aa89ca6adf6559f13d3e342ff8558
author Jeff Sharkey <jsharkey@android.com> Tue Dec 18 17:06:06 2012 -0800
committer Jeff Sharkey <jsharkey@android.com> Tue Dec 18 17:07:01 2012 -0800
tree fd3a63837c3715a6bd6c6b3e614a21b2d5dd2e07
parent 4e7ec240cabbdf3ac9776a691be0a46ea4e2e69e

Fix metered SSID matching regression.

WifiInfo changed to return SSIDs with quotes included, so relax our
identity matching to accept matches regardless of quotedness.

Bug: 7695807
Change-Id: Ib5d06666035e06b2d4b2f7cb498767d63b1b1828

core/java/android/net/NetworkTemplate.java

diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java
index d3839ad..c189ba4 100644
--- a/core/java/android/net/NetworkTemplate.java
+++ b/core/java/android/net/NetworkTemplate.java
@@ -22,6 +22,7 @@
 import static android.net.ConnectivityManager.TYPE_WIMAX;
 import static android.net.NetworkIdentity.COMBINE_SUBTYPE_ENABLED;
 import static android.net.NetworkIdentity.scrubSubscriberId;
+import static android.net.wifi.WifiInfo.removeDoubleQuotes;
 import static android.telephony.TelephonyManager.NETWORK_CLASS_2_G;
 import static android.telephony.TelephonyManager.NETWORK_CLASS_3_G;
 import static android.telephony.TelephonyManager.NETWORK_CLASS_4_G;
@@ -279,7 +280,8 @@
     private boolean matchesWifi(NetworkIdentity ident) {
         switch (ident.mType) {
             case TYPE_WIFI:
-                return Objects.equal(mNetworkId, ident.mNetworkId);
+                return Objects.equal(
+                        removeDoubleQuotes(mNetworkId), removeDoubleQuotes(ident.mNetworkId));
             default:
                 return false;
         }

services/java/com/android/server/net/NetworkPolicyManagerService.java

diff --git a/services/java/com/android/server/net/NetworkPolicyManagerService.java b/services/java/com/android/server/net/NetworkPolicyManagerService.java
index b09390c..cbd2a0f 100644
--- a/services/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -52,7 +52,6 @@
 import static android.net.NetworkTemplate.MATCH_WIFI;
 import static android.net.NetworkTemplate.buildTemplateMobileAll;
 import static android.net.TrafficStats.MB_IN_BYTES;
-import static android.net.wifi.WifiInfo.removeDoubleQuotes;
 import static android.net.wifi.WifiManager.CHANGE_REASON_ADDED;
 import static android.net.wifi.WifiManager.CHANGE_REASON_REMOVED;
 import static android.net.wifi.WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION;
@@ -551,8 +550,7 @@
                 final WifiConfiguration config = intent.getParcelableExtra(
                         EXTRA_WIFI_CONFIGURATION);
                 if (config.SSID != null) {
-                    final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
-                            removeDoubleQuotes(config.SSID));
+                    final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(config.SSID);
                     synchronized (mRulesLock) {
                         if (mNetworkPolicy.containsKey(template)) {
                             mNetworkPolicy.remove(template);
@@ -581,8 +579,7 @@
             final WifiInfo info = intent.getParcelableExtra(EXTRA_WIFI_INFO);
             final boolean meteredHint = info.getMeteredHint();
 
-            final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(
-                    removeDoubleQuotes(info.getSSID()));
+            final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(info.getSSID());
             synchronized (mRulesLock) {
                 NetworkPolicy policy = mNetworkPolicy.get(template);
                 if (policy == null && meteredHint) {