diff options
| author | paulhu <paulhu@google.com> | 2020-11-03 00:54:55 +0800 |
|---|---|---|
| committer | paulhu <paulhu@google.com> | 2020-11-03 00:54:55 +0800 |
| commit | 86054e5e42bd8de54eb502ab29e41ff1df7f3e40 (patch) | |
| tree | aec1b2a80e340f0d9c57124d01cd0858b38451a0 | |
| parent | 3c3baf163a39e95defc343194ee750b5c169327f (diff) | |
Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API
Connectivity service module is using some AppOpsManager @hide
APIs but they are not able to call after CS become a
mainline module. Thus, expose them to System APIs.
Bug: 170593746
Test: make update-api
Change-Id: Idb8ee13394ccbd266061eef0cab08a5e28948a3e
| -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 0104ca25795c..7a083a0cfb08 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 95fc15254cd4..cb767bf8d776 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 69b77a9b4c59..f67bc41ef4bc 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -1418,6 +1418,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 |