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

Commit 53723a74 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add some comments in isAlwaysOnVpnLockdownEnabled" am: 4db4933c am: 288837ff 

Change-Id: If4bc755c4825ab5f21a86192182ecddc036d6694
parents fdc5e782 288837ff

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();