diff options
| author | Paul Hu <paulhu@google.com> | 2020-11-05 09:37:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 09:37:59 +0000 |
| commit | d667289cc613d6dbf97941bb9d834dc2f438281d (patch) | |
| tree | 0471976be5ba4884001925ef3017ecb29fcc87a3 /core/java/android/app/AppOpsManager.java | |
| parent | 52717cf3f0514b86209c62ff2821eb514082c4b8 (diff) | |
| parent | b892146fb439ff9e96af0f42f982af86a7141db2 (diff) | |
Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb2b am: b8eb5b0ee1 am: b892146fb4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021
Change-Id: Ibe2ed0ef2cf3e2c654c8a1fca8dc045fc2666f08
Diffstat (limited to 'core/java/android/app/AppOpsManager.java')
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 9bbf34fcf469..e4ab6f2e01bd 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1441,6 +1441,7 @@ public class AppOpsManager { @SystemApi public static final String OPSTR_INTERACT_ACROSS_PROFILES = "android:interact_across_profiles"; /** @hide Start Platform VPN without user intervention */ + @SystemApi public static final String OPSTR_ACTIVATE_PLATFORM_VPN = "android:activate_platform_vpn"; /** @hide */ @SystemApi |