Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05d67f62 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Allow wildcard for bypass proxy" into jb-mr2-dev

parents 86ecd3c4 b7cb3744

src/com/android/settings/ProxySelector.java

+1 −1
Original line number Diff line number Diff line
@@ -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);