commit 9847e78b7203b860dd529234ae65b2f44f6e41cb
author Robin Lee <rgl@google.com> Mon Jan 23 16:40:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 23 16:40:07 2017 +0000
tree 77e61212fff1f7f177a5c53f9dfc8e41d9b0fd26
parent 1f2437c65ae2004ff9751afbbaac530ea870ffad
parent 45dbfe7c3e30ea5af226213b7b1ebfd5f34af0cd

Merge "Disable always-on VPN in factoryReset"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 5549ced..8c38ed6 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5501,6 +5501,18 @@
                 }
             }
 
+            // Turn Always-on VPN off
+            if (mLockdownEnabled && userId == UserHandle.USER_SYSTEM) {
+                final long ident = Binder.clearCallingIdentity();
+                try {
+                    mKeyStore.delete(Credentials.LOCKDOWN_VPN);
+                    mLockdownEnabled = false;
+                    setLockdownTracker(null);
+                } finally {
+                    Binder.restoreCallingIdentity(ident);
+                }
+            }
+
             // Turn VPN off
             VpnConfig vpnConfig = getVpnConfig(userId);
             if (vpnConfig != null) {