Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135 Change-Id: Id5bfe41bdf8ce53c5da5e9d6322abf7f9df46837
2020-10-08 04:27:35 +00:00
parent 3b9f0fb6c3 a2a586a61a
commit d29dc3d991
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1330,7 +1330,7 @@ public class Vpn {
     */
    public synchronized void onUserStopped() {
        // Switch off networking lockdown (if it was enabled)
-        setLockdown(false);
+        setVpnForcedLocked(false);
        mAlwaysOn = false;

        // Quit any active connections