commit 17e6183b85ba3038acb935aaa01415058b2e6ddd
author Robin Lee <rgl@google.com> Mon May 09 13:46:28 2016 +0100
committer Robin Lee <rgl@google.com> Thu May 19 00:26:53 2016 +0100
tree 24620c64f25a59c5f016861048990f9e0df54863
parent 4d03abcd49af490dba3850d341b955dd72f24959

Lock down networking when waiting for always-on

Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 370cd57..dd27528 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4672,6 +4672,14 @@
         public static final String ALWAYS_ON_VPN_APP = "always_on_vpn_app";
 
         /**
+         * Whether to block networking outside of VPN connections while always-on is set.
+         * @see #ALWAYS_ON_VPN_APP
+         *
+         * @hide
+         */
+        public static final String ALWAYS_ON_VPN_LOCKDOWN = "always_on_vpn_lockdown";
+
+        /**
          * Whether applications can be installed for this user via the system's
          * {@link Intent#ACTION_INSTALL_PACKAGE} mechanism.
          *