Merge "Add some comments in isAlwaysOnVpnLockdownEnabled"

This commit is contained in:
Lucas Lin
2020-03-16 10:08:51 +00:00
committed by Gerrit Code Review

View File

@@ -5311,6 +5311,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();