diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-12-18 17:06:06 -0800 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-12-18 17:07:01 -0800 |
| commit | 2e4dce0dd24aa89ca6adf6559f13d3e342ff8558 (patch) | |
| tree | fd3a63837c3715a6bd6c6b3e614a21b2d5dd2e07 /services/java/com/android | |
| parent | 4e7ec240cabbdf3ac9776a691be0a46ea4e2e69e (diff) | |
| download | frameworks_base-2e4dce0dd24aa89ca6adf6559f13d3e342ff8558.zip frameworks_base-2e4dce0dd24aa89ca6adf6559f13d3e342ff8558.tar.gz frameworks_base-2e4dce0dd24aa89ca6adf6559f13d3e342ff8558.tar.bz2 | |
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
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/net/NetworkPolicyManagerService.java | 7 |
1 files changed, 2 insertions, 5 deletions
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_MOBILE_ALL; 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 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 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 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 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) { |