diff options
| author | Paul Hu <paulhu@google.com> | 2020-11-05 07:55:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-05 07:55:10 +0000 |
| commit | 01bec3bb2b49a6e5754214a70e0c5384527e392b (patch) | |
| tree | cce0f51c5eec683946318f54b5f2b5d509bc2e77 | |
| parent | df86206d8273769b7b061f0d9b9e381128d87132 (diff) | |
| parent | 86054e5e42bd8de54eb502ab29e41ff1df7f3e40 (diff) | |
Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API"
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index dc90877569d5..9a27584a117d 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -369,6 +369,7 @@ package android.app { field public static final String OPSTR_ACCEPT_HANDOVER = "android:accept_handover"; field public static final String OPSTR_ACCESS_ACCESSIBILITY = "android:access_accessibility"; field public static final String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications"; + field public static final String OPSTR_ACTIVATE_PLATFORM_VPN = "android:activate_platform_vpn"; field public static final String OPSTR_ACTIVATE_VPN = "android:activate_vpn"; field public static final String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot"; field public static final String OPSTR_ASSIST_STRUCTURE = "android:assist_structure"; diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 8b1e65fe3641..28e5804a5d8a 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -369,6 +369,7 @@ package android.app { field public static final String OPSTR_ACCEPT_HANDOVER = "android:accept_handover"; field public static final String OPSTR_ACCESS_ACCESSIBILITY = "android:access_accessibility"; field public static final String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications"; + field public static final String OPSTR_ACTIVATE_PLATFORM_VPN = "android:activate_platform_vpn"; field public static final String OPSTR_ACTIVATE_VPN = "android:activate_vpn"; field public static final String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot"; field public static final String OPSTR_ASSIST_STRUCTURE = "android:assist_structure"; diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 0d5bb115db91..1c8c6c1d5d03 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1439,6 +1439,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 |