Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic730c4d98a309aadcde740d77582ffb7d788337f
This commit is contained in:
TreeHugger Robot
2020-10-08 04:54:24 +00:00
committed by Automerger Merge Worker
parent 3ea188d4d2 d29dc3d991
commit e7069bce3c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1330,7 +1330,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