Merge "Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" am:... (5f9f81bb) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -5732,6 +5732,10 @@ public class DevicePolicyManager {
		throwIfParentInstance("isAlwaysOnVpnLockdownEnabled");
		if (mService != null) {
		try {
		// Starting from Android R, the caller can pass the permission check in
		// DevicePolicyManagerService if it holds android.permission.MAINLINE_NETWORK_STACK.
		// Note that the android.permission.MAINLINE_NETWORK_STACK is a signature permission
		// which is used by the NetworkStack mainline module.
		return mService.isAlwaysOnVpnLockdownEnabled(admin);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();