Commit f1c03846 authored Oct 08, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Oct 08, 2020

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev...

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6d am: a2a586a6 am: d29dc3d9 am: e7069bce

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

Change-Id: I0b180698048fb1c643d90f2d038d1df8d66fc671

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

+1 −1

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