Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c am: f1c038465d am: 488660a841 am: fa36d922fa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135 Change-Id: Ib9900b5a57bee76a417bd17b8cebb086821bf649
2020-10-08 06:14:18 +00:00
parent 672dbc997c fa36d922fa
commit 6284768b34
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
@@ -1608,7 +1608,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