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

Commit ee1fd5bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc for ACTION_ADMIN_POLICY_COMPLIANCE to include new... 

Merge "Update javadoc for ACTION_ADMIN_POLICY_COMPLIANCE to include new extras" into tm-dev am: 2cb1f353

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

Change-Id: I5a9e5d1038c00c9dd9471897e62d6ae45860aa3e
parents 151e2053 2cb1f353

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

+21 −2
Original line number Diff line number Diff line
@@ -1413,6 +1413,9 @@ public class DevicePolicyManager { 
     * admin app when performing the admin-integrated provisioning flow as a result of the

     * {@link #ACTION_GET_PROVISIONING_MODE} activity.

     *

     * <p>This extra may also be provided to the admin app via an intent extra for {@link

     * #ACTION_GET_PROVISIONING_MODE}.

     *

     * @see #ACTION_GET_PROVISIONING_MODE

     */

    public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT =
@@ -3062,6 +3065,8 @@ public class DevicePolicyManager { 
     *     <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}</li>

     *     <li>{@link #EXTRA_PROVISIONING_IMEI}</li>

     *     <li>{@link #EXTRA_PROVISIONING_SERIAL_NUMBER}</li>

     *     <li>{@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES}</li>

     *     <li>{@link #EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT}</li>

     * </ul>

     *

     * <p>The target activity should return one of the following values in
@@ -3085,8 +3090,22 @@ public class DevicePolicyManager { 
     * activity, along with the values of the {@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE} extra

     * that are already supplied to this activity.

     *

     * @see #EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION

     * @see #EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED

     * <p>Other extras the target activity may include in the intent result:

     * <ul>

     *     <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}</li>

     *     <li>{@link #EXTRA_PROVISIONING_SKIP_ENCRYPTION}</li>

     *     <li>{@link #EXTRA_PROVISIONING_KEEP_SCREEN_ON}</li>

     *     <li>{@link #EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION} for work profile

     *     provisioning</li>

     *     <li>{@link #EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED} for work profile

     *     provisioning</li>

     *     <li>{@link #EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT} for fully-managed

     *     device provisioning</li>

     *     <li>{@link #EXTRA_PROVISIONING_LOCALE} for fully-managed device provisioning</li>

     *     <li>{@link #EXTRA_PROVISIONING_LOCAL_TIME} for fully-managed device provisioning</li>

     *     <li>{@link #EXTRA_PROVISIONING_TIME_ZONE} for fully-managed device provisioning</li>

     * </ul>

     *

     * @see #ACTION_ADMIN_POLICY_COMPLIANCE

     */

    public static final String ACTION_GET_PROVISIONING_MODE =