Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev (410abcdb) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -3048,7 +3048,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
		@Override
		public LegacyVpnInfo getLegacyVpnInfo(int userId) {
		enforceCrossUserPermission(userId);
		throwIfLockdownEnabled();
		if (mLockdownEnabled) {
		return null;
		}

		synchronized(mVpns) {
		return mVpns.get(userId).getLegacyVpnInfo();
		}