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

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

Merge "Rename ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER" into tm-dev

parents 581a881e 54ce9960

core/api/system-current.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -1128,7 +1128,7 @@ package android.app.admin { 
    field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE = "android.app.action.ROLE_HOLDER_PROVISION_MANAGED_PROFILE";

    field @RequiresPermission(android.Manifest.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 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 @Deprecated public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE";

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

    field @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP) public static final String ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER = "android.app.action.UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER";

    field public static final String EXTRA_FORCE_UPDATE_ROLE_HOLDER = "android.app.extra.FORCE_UPDATE_ROLE_HOLDER";

    field public static final String EXTRA_FORCE_UPDATE_ROLE_HOLDER = "android.app.extra.FORCE_UPDATE_ROLE_HOLDER";

    field public static final String EXTRA_LOST_MODE_LOCATION = "android.app.extra.LOST_MODE_LOCATION";

    field public static final String EXTRA_LOST_MODE_LOCATION = "android.app.extra.LOST_MODE_LOCATION";

    field public static final String EXTRA_PROFILE_OWNER_NAME = "android.app.extra.PROFILE_OWNER_NAME";

    field public static final String EXTRA_PROFILE_OWNER_NAME = "android.app.extra.PROFILE_OWNER_NAME";
@@ -1161,8 +1161,8 @@ package android.app.admin { 
    field public static final String REQUIRED_APP_MANAGED_PROFILE = "android.app.REQUIRED_APP_MANAGED_PROFILE";

    field public static final String REQUIRED_APP_MANAGED_PROFILE = "android.app.REQUIRED_APP_MANAGED_PROFILE";

    field public static final String REQUIRED_APP_MANAGED_USER = "android.app.REQUIRED_APP_MANAGED_USER";

    field public static final String REQUIRED_APP_MANAGED_USER = "android.app.REQUIRED_APP_MANAGED_USER";

    field public static final int RESULT_DEVICE_OWNER_SET = 123; // 0x7b

    field public static final int RESULT_DEVICE_OWNER_SET = 123; // 0x7b

    field public static final int RESULT_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR = 1; // 0x1

    field public static final int RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR = 1; // 0x1

    field public static final int RESULT_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR = 2; // 0x2

    field public static final int RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR = 2; // 0x2

    field public static final int RESULT_UPDATE_ROLE_HOLDER = 2; // 0x2

    field public static final int RESULT_UPDATE_ROLE_HOLDER = 2; // 0x2

    field public static final int RESULT_WORK_PROFILE_CREATED = 122; // 0x7a

    field public static final int RESULT_WORK_PROFILE_CREATED = 122; // 0x7a

    field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4

    field public static final int STATE_USER_PROFILE_COMPLETE = 4; // 0x4

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

+20 −15
Original line number Original line Diff line number Diff line
@@ -719,10 +719,11 @@ public class DevicePolicyManager { 
















    /**







    /**











     * A {@code boolean} extra which determines whether to force a role holder update, regardless







     * A {@code boolean} extra which determines whether to force a role holder update, regardless











     * of any internal conditions {@link #ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER} might have.







     * of any internal conditions {@link #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER} might














     * have.











     *







     *











     * <p>This extra can be provided to intents with action {@link







     * <p>This extra can be provided to intents with action {@link











     * #ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER}.







     * #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER}.











     *







     *











     * @hide







     * @hide











     */







     */










@@ -3281,39 +3282,43 @@ public class DevicePolicyManager {









     *







     *











     * <p>The activity must handle the device policy management role holder update and set the







     * <p>The activity must handle the device policy management role holder update and set the











     * intent result to either {@link Activity#RESULT_OK} if the update was successful, {@link







     * intent result to either {@link Activity#RESULT_OK} if the update was successful, {@link











     * #RESULT_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if it encounters a problem







     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if it encounters a











     * that may be solved by relaunching it again, or {@link







     * problem that may be solved by relaunching it again, or {@link











     * #RESULT_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if it encounters a problem







     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if it encounters a











     * that will not be solved by relaunching it again.







     * problem that will not be solved by relaunching it again.











     *







     *











     * <p>If this activity has additional internal conditions which are not met, it should return







     * <p>If this activity has additional internal conditions which are not met, it should return











     * {@link #RESULT_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR}.







     * {@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR}.











     *







     *











     * @hide







     * @hide











     */







     */











    @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP)







    @RequiresPermission(android.Manifest.permission.LAUNCH_DEVICE_MANAGER_SETUP)











    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)







    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)











    @SystemApi







    @SystemApi











    public static final String ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER =







    public static final String ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER =











            "android.app.action.UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER";







            "android.app.action.UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER";



























    /**







    /**











     * Result code that can be returned by the {@link #ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER}







     * Result code that can be returned by the {@link











     * handler if it encounters a problem that may be solved by relaunching it again.







     * #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER} handler if it encounters a problem














     * that may be solved by relaunching it again.











     *







     *











     * @hide







     * @hide











     */







     */











    @SystemApi







    @SystemApi











    public static final int RESULT_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR = 1;







    public static final int RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR =














            1;



























    /**







    /**











     * Result code that can be returned by the {@link #ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER}







     * Result code that can be returned by the {@link











     * handler if it encounters a problem that will not be solved by relaunching it again.







     * #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER} handler if it encounters a problem that














     * will not be solved by relaunching it again.











     *







     *











     * @hide







     * @hide











     */







     */











    @SystemApi







    @SystemApi











    public static final int RESULT_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR = 2;







    public static final int RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR =














            2;



























    /**







    /**











     * An {@link Intent} extra which resolves to a custom user consent screen.







     * An {@link Intent} extra which resolves to a custom user consent screen.