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

Commit 48b60587 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add @RequiresPermission for LAUNCH_DEVICE_MANAGER_SETUP"

parents 71abd123 a725709b

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -1038,12 +1038,12 @@ package android.app.admin { 
    field public static final String ACTION_PROVISION_FINANCED_DEVICE = "android.app.action.PROVISION_FINANCED_DEVICE";

    field public static final String ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";

    field @RequiresPermission(android.Manifest.permission.MANAGE_FACTORY_RESET_PROTECTION) public static final String ACTION_RESET_PROTECTION_POLICY_CHANGED = "android.app.action.RESET_PROTECTION_POLICY_CHANGED";

    field public static final String ACTION_ROLE_HOLDER_PROVISION_FINALIZATION = "android.app.action.ROLE_HOLDER_PROVISION_FINALIZATION";

    field public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";

    field public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_PROFILE";

    field @RequiresPermission("android.permission.LAUNCH_DEVICE_MANAGER_SETUP") public static final String ACTION_ROLE_HOLDER_PROVISION_FINALIZATION = "android.app.action.ROLE_HOLDER_PROVISION_FINALIZATION";

    field @RequiresPermission("android.permission.LAUNCH_DEVICE_MANAGER_SETUP") public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE";

    field @RequiresPermission("android.permission.LAUNCH_DEVICE_MANAGER_SETUP") public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_PROFILE";

    field public static final String ACTION_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER";

    field @Deprecated public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE";

    field public static final String ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER = "android.app.action.UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER";

    field @RequiresPermission("android.permission.LAUNCH_DEVICE_MANAGER_SETUP") public static final String ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER = "android.app.action.UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER";

    field public static final int CODE_ACCOUNTS_NOT_EMPTY = 6; // 0x6

    field public static final int CODE_CANNOT_ADD_MANAGED_PROFILE = 11; // 0xb

    field public static final int CODE_DEVICE_ADMIN_NOT_SUPPORTED = 13; // 0xd

core/java/android/app/admin/DevicePolicyManager.java

+4 −8
Original line number Diff line number Diff line
@@ -488,8 +488,7 @@ public class DevicePolicyManager { 
     *

     * @hide

     */

    // TODO(b/208628038): Uncomment when the permission is in place

    //  @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_ROLE_HOLDER)

    @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SystemApi

    public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE =
@@ -535,8 +534,7 @@ public class DevicePolicyManager { 
     *

     * @hide

     */

    // TODO(b/208628038): Uncomment when the permission is in place

    //  @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_ROLE_HOLDER)

    @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SystemApi

    public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE =
@@ -561,8 +559,7 @@ public class DevicePolicyManager { 
     *

     * @hide

     */

    // TODO(b/208628038): Uncomment when the permission is in place

    //  @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_ROLE_HOLDER)

    @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SystemApi

    public static final String ACTION_ROLE_HOLDER_PROVISION_FINALIZATION =
@@ -2859,8 +2856,7 @@ public class DevicePolicyManager { 
     *

     * @hide

     */

    // TODO(b/208628038): Uncomment when the permission is in place

    //  @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_ROLE_HOLDER)

    @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SystemApi

    public static final String ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER =