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

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

Merge "Fix error in javadoc" into tm-dev am: 10ba4dab 

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



Change-Id: I8ea1236cc06b20dea6f791a0ecbb09ea65b3060a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8eac50ce 10ba4dab

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

+4 −4
Original line number Diff line number Diff line
@@ -1811,10 +1811,6 @@ public class DevicePolicyManager { 
     * #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link

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

     *

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

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

     * #EXTRA_PROVISIONING_SERIAL_NUMBER} extras.

     *

     * <p>This flag can be combined with {@link #FLAG_SUPPORTED_MODES_PERSONALLY_OWNED}. In

     * that case, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity will have

     * the {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link
@@ -1834,6 +1830,10 @@ public class DevicePolicyManager { 
     * activity to have the {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra

     * contain only {@link #PROVISIONING_MODE_MANAGED_PROFILE}.

     *

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

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

     * #EXTRA_PROVISIONING_SERIAL_NUMBER} extras.

     *

     * <p>This flag can be combined with {@link #FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED}. In

     * that case, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity will have the

     * {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link