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

am: da68f0614c Change-Id: Ie2d433c537fc27cbe04f80cd74c464e4a216238e
2016-07-06 16:21:00 +00:00
parent e62b36bb33 da68f0614c
commit dfc9007e9a
1 changed files with 5 additions and 0 deletions
--- a/core/java/com/android/internal/net/VpnProfile.java
+++ b/core/java/com/android/internal/net/VpnProfile.java
@@ -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);