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

Commit 65a298f0 authored by Vitor Carvalho's avatar Vitor Carvalho Committed by Android (Google) Code Review
Browse files

Merge "Add @SystemApi annotation to the ENABLE and DISABLE_SUPERVISION intent... 

Merge "Add @SystemApi annotation to the ENABLE and DISABLE_SUPERVISION intent actions to allow system apps to use the constant." into main
parents 1d8f44e8 cc21d411

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2973,6 +2973,8 @@ package android.app.supervision { 
    method @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_USERS}) public android.content.Intent createConfirmSupervisionCredentialsIntent();

    method @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_USERS}) public boolean isSupervisionEnabled();

    method @FlaggedApi("android.permission.flags.enable_system_supervision_role_behavior") @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public boolean shouldAllowBypassingSupervisionRoleQualification();

    field @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") public static final String ACTION_DISABLE_SUPERVISION = "android.app.supervision.action.DISABLE_SUPERVISION";

    field @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") public static final String ACTION_ENABLE_SUPERVISION = "android.app.supervision.action.ENABLE_SUPERVISION";

  }















  @FlaggedApi("android.app.supervision.flags.supervision_manager_apis") public final class SupervisionRecoveryInfo implements android.os.Parcelable {

























core/java/android/app/supervision/SupervisionManager.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -95,6 +95,8 @@ public class SupervisionManager {













     *















     * @hide















     */













    @SystemApi













    @FlaggedApi(Flags.FLAG_SUPERVISION_MANAGER_APIS)















    public static final String ACTION_ENABLE_SUPERVISION =















            "android.app.supervision.action.ENABLE_SUPERVISION";

























@@ -110,6 +112,8 @@ public class SupervisionManager {













     *















     * @hide















     */













    @SystemApi













    @FlaggedApi(Flags.FLAG_SUPERVISION_MANAGER_APIS)















    public static final String ACTION_DISABLE_SUPERVISION =















            "android.app.supervision.action.DISABLE_SUPERVISION";