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

Commit eac929cd 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 

am: dfc9007e

Change-Id: Ieca6c0f30e69a0a122553b95510d4957d1da7182
parents c179797f dfc9007e

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);