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

Commit 641cfbe4 authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Add a new result code for the DPMRH updater to signal that the feature... 

Merge "Add a new result code for the DPMRH updater to signal that the feature is disabled" into tm-dev am: c2b95ea6

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

Change-Id: I03f3bc10c858de5f53f8ca51279032b4fdc45c7a
parents 8546ba7c c2b95ea6

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,7 @@ 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_USER = "android.app.REQUIRED_APP_MANAGED_USER";

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

    field public static final int RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_PROVISIONING_DISABLED = 3; // 0x3

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

    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

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

+16 −3
Original line number Diff line number Diff line
@@ -3295,9 +3295,11 @@ public class DevicePolicyManager { 
     * <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

     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_RECOVERABLE_ERROR} if it encounters a

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

     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if it encounters a

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

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

     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_PROVISIONING_DISABLED} if role holder

     * provisioning is disabled, or {@link

     * #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR} if it encounters

     * any other 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

     * {@link #RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR}.
@@ -3332,6 +3334,17 @@ public class DevicePolicyManager { 
    public static final int RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_UNRECOVERABLE_ERROR =

            2;













    /**













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













     * #ACTION_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER} handler if role holder provisioning













     * is disabled.













     *













     * @hide













     */













    @SystemApi













    public static final int













            RESULT_UPDATE_DEVICE_POLICY_MANAGEMENT_ROLE_HOLDER_PROVISIONING_DISABLED = 3;



























    /**















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















     *