commit e8d4f2f98b18dbe37bb1aba76d4151c56fbfb2a4
author Irfan Sheriff <isheriff@google.com> Wed Aug 22 14:19:52 2012 -0700
committer Irfan Sheriff <isheriff@google.com> Wed Aug 22 14:19:52 2012 -0700
tree 15c74eff8ddc6bdbef120c67ece5cb0b1c2b75d1
parent 21d07b954afc3b2db980baaf12e72ebd0d84f19d

Simplify proxy regex

Bug: 6950756
Change-Id: I535be03073cf9f502631498939c841f88fb1617d

src/com/android/settings/ProxySelector.java

diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 909496e..f521d6d 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -63,7 +63,7 @@
             "^$|^[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 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;
     static {
         HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);