From bae6d820d2227754bcaa341621d270ba39b59820 Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Wed, 6 Jul 2016 10:30:04 +0100
Subject: [PATCH] Update isValidLockdownProfile to block PPTP

Since this isn't supported and it will take a framework update to make
it work.

Bug: 28807474
Change-Id: I12371134a1c51a53af26fe8c4db1f04b0f687abe
---
 core/java/com/android/internal/net/VpnProfile.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java
index 5c92f3c68c774..9a5543afcd789 100644
--- 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);