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

am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev

Browse Source 
* commit '9e0fdfec70f181ec71198822fa39e749248c5f87':
  Simplify proxy regex
This commit is contained in:
Irfan Sheriff
2012-08-22 14:24:20 -07:00
committed by Android Git Automerger
parent 5a2dce6092 9e0fdfec70
commit aea749fa94
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

@@ -63,7 +63,7 @@ public class ProxySelector extends Fragment implements DialogCreatable {
"^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$"; "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
private static final Pattern HOSTNAME_PATTERN; private static final Pattern HOSTNAME_PATTERN;
private static final String EXCLUSION_REGEXP = private static final String EXCLUSION_REGEXP =
"$|^(.?[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*)+$"; "$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
private static final Pattern EXCLUSION_PATTERN; private static final Pattern EXCLUSION_PATTERN;
static { static {
HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP); HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);