Commit 2099fa5a authored Oct 14, 2020 by Treehugger Robot Committed by Automerger Merge Worker Oct 14, 2020

Merge "Fix storing the wrong value of mLockdown in setting" am: 59ce8cd4

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

Change-Id: I820a681ee427b485d403939d023a1f6387d52ba6

services/core/java/com/android/server/connectivity/Vpn.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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