diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-16 11:20:08 +0000 |
|---|---|---|
| committer | Lucas Lin <lucaslin@google.com> | 2020-03-17 02:43:49 +0000 |
| commit | a3630a528ff126398baa304af68f065d6689c3fc (patch) | |
| tree | e08e02202aebb397ef0eabbb71c802ffb3adfb68 /core/java/android | |
| parent | 07dbadcd14ebd4c3fe8454386cf726749a590cde (diff) | |
Add some comments in isAlwaysOnVpnLockdownEnabled
Bug: 141621373
Test: Build pass.
Change-Id: Ie063d9ad35fd703ad376e993345e7158c6082b87
Merged-In: Ib9df71192937164ff95ce564195d5d68508ec69d
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index bc8d05e0810e..32e0f7377fae 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -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(); |