PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up oddly quoted NetworkPolicies.

Browse Source 
Bug: 7695807
Change-Id: Ia3f04dc3e918d6ca4af62f263a9c90273b3485ff
This commit is contained in:
Jeff Sharkey
2012-12-18 17:32:10 -08:00
parent a66c0ab094
commit 53f2855808
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/net/NetworkPolicyEditor.java
View File

@@ -31,7 +31,9 @@ import static com.android.internal.util.Preconditions.checkNotNull;
import android.net.NetworkPolicy; import android.net.NetworkPolicy;
import android.net.NetworkPolicyManager; import android.net.NetworkPolicyManager;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.net.wifi.WifiInfo;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.text.TextUtils;
import android.text.format.Time; import android.text.format.Time;
import com.android.internal.util.Objects; import com.android.internal.util.Objects;
@@ -221,6 +223,18 @@ public class NetworkPolicyEditor {
} }
} }
// Remove any oddly escaped policies while we're here
final String networkId = template.getNetworkId();
final String strippedNetworkId = WifiInfo.removeDoubleQuotes(networkId);
if (!TextUtils.equals(strippedNetworkId, networkId)) {
policy = getPolicy(new NetworkTemplate(
template.getMatchRule(), template.getSubscriberId(), strippedNetworkId));
if (policy != null) {
mPolicies.remove(policy);
modified = true;
}
}
if (modified) writeAsync(); if (modified) writeAsync();
} }