diff options
| author | 2020-10-08 05:36:39 +0000 | |
|---|---|---|
| committer | 2020-10-08 05:36:39 +0000 | |
| commit | a50be49dd45ae408fde09092468a4f7184565d54 (patch) | |
| tree | bb9739974b7832d929d3b1d98009804a8af67345 | |
| parent | 741959e1eb9cd09a58484c8ad20c5107a2cf34f0 (diff) | |
| parent | f1c038465d93b2cff00ff3f9431e3fdf434d37c5 (diff) | |
Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c am: f1c038465d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135
Change-Id: I33bc6c6b1c1ce5adffe1ef7ad84d18833d996240
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 1f85d1046523..dbb91a58369d 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -1467,7 +1467,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 |