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

Commit dfc9007e authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge \"Update isValidLockdownProfile to block PPTP\" into nyc-mr1-dev 

am: da68f061

Change-Id: Ie2d433c537fc27cbe04f80cd74c464e4a216238e
parents e62b36bb da68f061

core/java/com/android/internal/net/VpnProfile.java

+5 −0
Original line number Diff line number Diff line
@@ -176,6 +176,11 @@ public class VpnProfile implements Cloneable, Parcelable { 
     * connection.

     */

    public boolean isValidLockdownProfile() {

        // b/7064069: lockdown firewall blocks ports that would be used for PPTP

        if (type == TYPE_PPTP) {

            return false;

        }



        try {

            InetAddress.parseNumericAddress(server);