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

Commit b892146f authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am:... 

Merge "Expose AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN as system API" am: 01bec3bb am: b8eb5b0e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484021

Change-Id: I280d5f807ee40838ab8abe865a3d272e58ce8cbb
parents 632960f6 b8eb5b0e

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/app/AppOpsManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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