commit bae6d820d2227754bcaa341621d270ba39b59820
author Robin Lee <rgl@google.com> Wed Jul 06 10:30:04 2016 +0100
committer Robin Lee <rgl@google.com> Wed Jul 06 09:41:05 2016 +0000
tree bba6932dc99b28ebe59d0390b93d95758fb37aed
parent 2573d83fa9052753ee1f4abc8683905ae2acbc25

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

diff --git a/core/java/com/android/internal/net/VpnProfile.java b/core/java/com/android/internal/net/VpnProfile.java
index 5c92f3c..9a5543a 100644
--- a/core/java/com/android/internal/net/VpnProfile.java
+++ b/core/java/com/android/internal/net/VpnProfile.java
@@ -176,6 +176,11 @@
      * 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);