Merge "Allow wildcard for bypass proxy" into jb-mr2-dev

daavvis · Mar 26, 2013 · 05d67f6 · 05d67f6
2 parents 86ecd3c + b7cb374
commit 05d67f6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
@@ -67,7 +67,7 @@ public class ProxySelector extends Fragment implements DialogCreatable {
             "^$|^[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
     private static final Pattern HOSTNAME_PATTERN;
     private static final String EXCLUSION_REGEXP =
-            "$|^[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
+            "$|^(\\*)?\\.?[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
     private static final Pattern EXCLUSION_PATTERN;
     static {
         HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);