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

am 05d67f62: Merge "Allow wildcard for bypass proxy" into jb-mr2-dev

Browse Source 
* commit '05d67f62b7370b3bbe3bf691ae01b8a46dd04606':
  Allow wildcard for bypass proxy
This commit is contained in:
Irfan Sheriff
2013-03-26 15:44:43 -07:00
committed by Android Git Automerger
parent f1c9b70801 05d67f62b7
commit 1e1baa824b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ProxySelector.java
View File

@@ -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);