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

Commit fca25ea6 authored by arangelov's avatar arangelov Committed by Automerger Merge Worker
Browse files

Provide clearer explanation for SUPPORTED_MODES_ORGANIZATION_OWNED am: c8f03de4 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8dd1e892cf768af33d0b2abcabcfc1f7f0dd7d02
parents 72266d0d c8f03de4

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

+5 −4
Original line number Diff line number Diff line
@@ -1300,10 +1300,11 @@ public class DevicePolicyManager { 
     * A value for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that provisioning is

     * organization-owned.

     *

     * <p>Using this value will cause the admin app's {@link #ACTION_GET_PROVISIONING_MODE}

     * activity to have the {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra

     * contain {@link #PROVISIONING_MODE_MANAGED_PROFILE} and {@link

     * #PROVISIONING_MODE_FULLY_MANAGED_DEVICE}.

     * <p>Using this value indicates the admin app can only be provisioned in either a

     * fully-managed device or a corporate-owned work profile. This will cause the admin app's

     * {@link #ACTION_GET_PROVISIONING_MODE} activity to have the {@link

     * #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link

     * #PROVISIONING_MODE_MANAGED_PROFILE} and {@link #PROVISIONING_MODE_FULLY_MANAGED_DEVICE}.

     *

     * <p>Also, if this value is set, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity

     * will not receive the {@link #EXTRA_PROVISIONING_IMEI} and {@link