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

Commit d5002c12 authored by Benjamin Franz's avatar Benjamin Franz Committed by Android (Google) Code Review
Browse files

Merge "Introduce new intent action to set parent challenge"

parents 17971e38 c9921098

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5902,6 +5902,7 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";

    field public static final java.lang.String ACTION_PROVISION_MANAGED_DEVICE = "android.app.action.PROVISION_MANAGED_DEVICE";

    field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.PROVISION_MANAGED_PROFILE";

    field public static final java.lang.String ACTION_SET_NEW_PARENT_PROFILE_PASSWORD = "android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD";

    field public static final java.lang.String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD";

    field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";

    field public static final java.lang.String ACTION_SYSTEM_UPDATE_POLICY_CHANGED = "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6045,6 +6045,7 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";

    field public static final java.lang.String ACTION_PROVISION_MANAGED_DEVICE = "android.app.action.PROVISION_MANAGED_DEVICE";

    field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.PROVISION_MANAGED_PROFILE";

    field public static final java.lang.String ACTION_SET_NEW_PARENT_PROFILE_PASSWORD = "android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD";

    field public static final java.lang.String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD";

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

    field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5904,6 +5904,7 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";

    field public static final java.lang.String ACTION_PROVISION_MANAGED_DEVICE = "android.app.action.PROVISION_MANAGED_DEVICE";

    field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.PROVISION_MANAGED_PROFILE";

    field public static final java.lang.String ACTION_SET_NEW_PARENT_PROFILE_PASSWORD = "android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD";

    field public static final java.lang.String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD";

    field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";

    field public static final java.lang.String ACTION_SYSTEM_UPDATE_POLICY_CHANGED = "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED";

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

+16 −0
Original line number Diff line number Diff line
@@ -773,11 +773,27 @@ public class DevicePolicyManager { 
     * have the user select a new password in order to meet the current

     * constraints. Upon being resumed from this activity, you can check the new

     * password characteristics to see if they are sufficient.

     *

     * If the intent is launched from within a managed profile with a profile

     * owner built against {@link android.os.Build.VERSION_CODES#M} or before,

     * this will trigger entering a new password for the parent of the profile.

     * For all other cases it will trigger entering a new password for the user

     * or profile it is launched from.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_SET_NEW_PASSWORD

            = "android.app.action.SET_NEW_PASSWORD";



    /**

     * Activity action: have the user enter a new password for the parent profile.

     * If the intent is launched from within a managed profile, this will trigger

     * entering a new password for the parent of the profile. In all other cases

     * the behaviour is identical to {@link #ACTION_SET_NEW_PASSWORD}.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_SET_NEW_PARENT_PROFILE_PASSWORD

            = "android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD";



    /**

     * Flag used by {@link #addCrossProfileIntentFilter} to allow activities in

     * the parent profile to access intents sent from the managed profile.