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

Commit d5273da9 authored by Yuhao Zheng's avatar Yuhao Zheng Committed by Android (Google) Code Review
Browse files

Merge "Allow more proxy bypass patterns"

parents 5c43d4e4 3dce5af6

core/java/android/net/Proxy.java

+4 −2
Original line number Diff line number Diff line
@@ -90,8 +90,10 @@ public final class Proxy { 


    private static final Pattern HOSTNAME_PATTERN;



    private static final String EXCLLIST_REGEXP = "$|^(.?" + NAME_IP_REGEX

        + ")+(,(.?" + NAME_IP_REGEX + "))*$";

    private static final String EXCL_REGEX =

        "[a-zA-Z0-9*]+(\\-[a-zA-Z0-9*]+)*(\\.[a-zA-Z0-9*]+(\\-[a-zA-Z0-9*]+)*)*";



    private static final String EXCLLIST_REGEXP = "^$|^" + EXCL_REGEX + "(," + EXCL_REGEX + ")*$";



    private static final Pattern EXCLLIST_PATTERN;