Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92b07746 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" into rvc-dev am:...

Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" into rvc-dev am: 19f09b23 am: 54db9642

Change-Id: I3827d140e4faaf2e2af07e34af0232c97580d8a5
parents fd2c9728 54db9642
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -5736,6 +5736,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();