diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-08 04:27:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-08 04:27:35 +0000 |
| commit | d29dc3d991a9f3a2d7b877ad676d84697256057b (patch) | |
| tree | 9b3d6186af7eb6cf92c880a54d90a04d91278ac7 | |
| parent | 3b9f0fb6c37805219b70942e9242b216f45a0407 (diff) | |
| parent | a2a586a61a528a3bf16703148d072f253b32e638 (diff) | |
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
| -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 40a4820355ad..4efd6963af48 100644 --- 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 |