diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-03-26 15:08:52 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2013-03-26 15:08:52 -0700 |
| commit | b7cb3744da83645523aed6c9154fe89a9f644b62 (patch) | |
| tree | 8c706304e468b87cadb5b72f0eccca33c34b986b /src | |
| parent | ca8e9cd383c0131cb5e73a177ec948de577a9f60 (diff) | |
| download | packages_apps_Settings-b7cb3744da83645523aed6c9154fe89a9f644b62.zip packages_apps_Settings-b7cb3744da83645523aed6c9154fe89a9f644b62.tar.gz packages_apps_Settings-b7cb3744da83645523aed6c9154fe89a9f644b62.tar.bz2 | |
Allow wildcard for bypass proxy
Allow *.example.com to be bypassed
Bug: 7422561
Change-Id: Ia7bd2d5b0a19794ae3bcccb8d6b78aeb2ba9c5fb
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ProxySelector.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index 9bb6dca..21e717a 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); |