From b7cb3744da83645523aed6c9154fe89a9f644b62 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Tue, 26 Mar 2013 15:08:52 -0700 Subject: [PATCH] Allow wildcard for bypass proxy Allow *.example.com to be bypassed Bug: 7422561 Change-Id: Ia7bd2d5b0a19794ae3bcccb8d6b78aeb2ba9c5fb --- src/com/android/settings/ProxySelector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index 9bb6dca74..21e717a4a 100644 --- 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);