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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I1fb24e81863dde068986b75e421c1dad5a483c50
This commit is contained in:
TreeHugger Robot
2020-10-08 05:51:31 +00:00
committed by Automerger Merge Worker

View File

@@ -1608,7 +1608,7 @@ public class Vpn {
*/ */
public synchronized void onUserStopped() { public synchronized void onUserStopped() {
// Switch off networking lockdown (if it was enabled) // Switch off networking lockdown (if it was enabled)
setLockdown(false); setVpnForcedLocked(false);
mAlwaysOn = false; mAlwaysOn = false;
// Quit any active connections // Quit any active connections